Changeset 21843 for ps

Timestamp:

06/07/18 00:25:15 (7 years ago)

Author:

elexis

Message:

Prevent calling the JS gamestart function twice when doubleclicking on the "Start Game" button.

It triggered an OOS on rejoin prior to rP21836, refs #5199 and
resulted in the playernames of the current match persisting into new gamesetups, fixes #5206.

Differential Revision: ​https://code.wildfiregames.com/D1558
Comments By: wraitii

File:

• ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js (modified) (4 diffs)

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -278 +278 @@
 
 /**
- * Used to prevent calling resetReadyData when starting a game.
+ * Used to prevent calling resetReadyData when starting a game or doubleclicking on the "Start Game" button.
  */
 var g_GameStarted = false;
@@ -1019 +1019 @@
                     translate("Start a new game with the current settings.") :
                     translate("Start a new game with the current settings (disabled until all players are ready)"),
-        "enabled": () => !g_IsController ||
-                         Object.keys(g_PlayerAssignments).every(guid => g_PlayerAssignments[guid].status ||
-                                                                        g_PlayerAssignments[guid].player == -1 ||
-                                                                        guid == Engine.GetPlayerGUID() && g_IsController),
+        "enabled": () => !g_GameStarted && (
+                           !g_IsController ||
+                           Object.keys(g_PlayerAssignments).every(guid => g_PlayerAssignments[guid].status ||
+                                                                          g_PlayerAssignments[guid].player == -1 ||
+                                                                          guid == Engine.GetPlayerGUID() && g_IsController)),
         "hidden": () =>
             !g_PlayerAssignments[Engine.GetPlayerGUID()] ||
@@ -2180 +2181 @@
     }
 
-    if (!g_GameAttributes.map)
+    if (!g_GameAttributes.map || g_GameStarted)
         return;
+
+    // Prevent reseting the readystate or calling this function twice
+    g_GameStarted = true;
+    updateGUIMiscControl("startGame");
 
     savePersistMatchSettings();
@@ -2201 +2206 @@
 
     g_GameAttributes.settings.TriggerScripts = g_GameAttributes.settings.VictoryScripts.concat(g_GameAttributes.settings.TriggerScripts || []);
-
-    // Prevent reseting the readystate
-    g_GameStarted = true;
 
     g_GameAttributes.settings.mapType = g_GameAttributes.mapType;