Page MenuHomeWildfire Games
Differential D472

Avoid NetClient FSM error when pausing while loading the game
ClosedPublic
Actions

Authored by echotangoecho on May 10 2017, 5:28 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Sep 5, 3:58 PM
Unknown Object (File)
Wed, Sep 4, 7:12 AM
Unknown Object (File)
Tue, Sep 3, 4:52 PM
Subscribers
Imarok
Vulcan
Restricted Owners Package
Restricted Owners Package

Details

Reviewers
elexis
Imarok
Commits
rP19563: Avoid NetClient FSM error when pausing while loading the game.
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
Branch
4261
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 1636
Build 2581: Vulcan BuildJenkins
Build 2580: arc lint + arc unit

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
echotangoecho updated this revision to Diff 1827.May 10 2017, 6:51 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.

Harbormaster completed remote builds in B1621: Diff 1825.May 11 2017, 12:12 AM
Vulcan added a comment.May 11 2017, 2:32 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/1128/ for more details.

Harbormaster completed remote builds in B1623: Diff 1827.May 11 2017, 2:32 AM
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

Why not just add the g_IsNetworkedActive check here?

echotangoecho updated this revision to Diff 1840.May 11 2017, 1:25 PM
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
Vulcan added a comment.May 11 2017, 2:12 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.

Harbormaster completed remote builds in B1636: Diff 1840.May 11 2017, 2:12 PM
Imarok added a comment.May 11 2017, 3:20 PM

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

binaries/data/mods/public/gui/session/menu.js
1044

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

echotangoecho updated this revision to Diff 1848.May 11 2017, 3:57 PM
echotangoecho edited edge metadata.
echotangoecho updated this revision to Diff 1849.May 11 2017, 5:11 PM
Vulcan added a comment.May 11 2017, 8:28 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/1145/ for more details.

Harbormaster completed remote builds in B1644: Diff 1848.May 11 2017, 8:28 PM
Vulcan added a comment.May 11 2017, 9:15 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/1146/ for more details.

Harbormaster completed remote builds in B1645: Diff 1849.May 11 2017, 9:15 PM
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
Closed by commit rP19563: Avoid NetClient FSM error when pausing while loading the game. (authored by Imarok). · Explain WhyMay 12 2017, 3:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
binaries/
data/
mods/
public/
gui/
session/
4 lines

Diff 1840

View Options

binaries/data/mods/public/gui/session/menu.js

Loading...
Wildfire Games · Phabricator