Page MenuHomeWildfire Games

Avoid NetClient FSM error when pausing while loading the game
ClosedPublic

Authored by echotangoecho on May 10 2017, 5:28 PM.

Details

Test Plan

verify that the code is correct, maybe try reproducing the original error and verifying it doesn't happen with the patch (but might be difficult in this case).

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

echotangoecho created this revision.May 10 2017, 5:28 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.May 10 2017, 5:28 PM
elexis retitled this revision from Attempt to fix NetClient FSM error to Fix NetClient FSM error when pausing while loading the game.May 10 2017, 5:30 PM

Fix indentation style.

Vulcan added a subscriber: Vulcan.May 11 2017, 12:11 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/1126/ for more details.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/1128/ for more details.

Imarok added a subscriber: Imarok.May 11 2017, 12:26 PM

See concern at rP18204

Imarok added inline comments.May 11 2017, 1:14 PM
binaries/data/mods/public/gui/session/menu.js
1041 ↗(On Diff #1827)

Why not just add the g_IsNetworkedActive check here?

Imarok requested changes to this revision.May 11 2017, 1:29 PM

As discussed, just prevent pausing while others are still loading js (and cpp-wise?)

This revision now requires changes to proceed.May 11 2017, 1:29 PM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/1137/ for more details.

with that and the merged early return, I will commit it.

binaries/data/mods/public/gui/session/menu.js
1044 ↗(On Diff #1840)

elexis proposed The NetServer only supports pausing after all clients finished loading the game as comment

echotangoecho edited edge metadata.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/1145/ for more details.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/1146/ for more details.

Imarok accepted this revision.May 12 2017, 11:03 AM
This revision is now accepted and ready to land.May 12 2017, 11:03 AM
elexis retitled this revision from Fix NetClient FSM error when pausing while loading the game to Avoid NetClient FSM error when pausing while loading the game.May 12 2017, 11:08 AM
This revision was automatically updated to reflect the committed changes.