Diffusion 0 A.D. Public Repository rP21836

Fix an OOS on rejoin after doubleclicking on the StartGame button, fixes #5199…
rP21836
Actions

Description

Fix an OOS on rejoin after doubleclicking on the StartGame button, fixes #5199, refs #5162.

Prevents changes to the gamesettings after the game was started, so as to use the correct map seed when generating the random map terrain for rejoiners.
D1558 will prevent the UI bug #5206 and FSM error from doubleclicking on StartGame.

Differential Revision: https://code.wildfiregames.com/D1562
Tested and accepted by: temple

Details

Committed

elexis

Jun 5 2018, 2:24 PM

Differential Revision

D1562: Prevent OOS on rejoin by preventing the NetServer from changing GameSettings after starting the game

Parents

rP21835: Always call SetPassabilityCircular -- Fix OOS after rejoin on square maps

Branches

Unknown

Tags

Unknown

Build Status

Buildable 6220
Build 10330: Trigger Windows Autobuild
Build 10329: Post-Commit Build	Jenkins

Event Timeline

elexis committed rP21836: Fix an OOS on rejoin after doubleclicking on the StartGame button, fixes #5199….Jun 5 2018, 2:24 PM

elexis mentioned this in D1558: Prevent doubleclicking on StartGame.Jun 5 2018, 2:44 PM

Harbormaster completed building B6220: rP21836: Fix an OOS on rejoin after doubleclicking on the StartGame button, fixes #5199….Jun 5 2018, 3:18 PM

elexis mentioned this in rP21843: Prevent calling the JS gamestart function twice when doubleclicking on the….Jun 7 2018, 12:25 AM

Changes (1)

Path

Size

ps/

trunk/

source/

network/

NetServer.cpp

rP21836

View Options

ps/trunk/source/network/NetServer.cpp