Protect against concurrent tries to join a lobby

4ian · Jan 29, 2025 · ab85ba7 · ab85ba7
1 parent cae036b
commit ab85ba7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Extensions/Multiplayer/multiplayertools.ts b/Extensions/Multiplayer/multiplayertools.ts
@@ -1616,9 +1616,8 @@ namespace gdjs {
       runtimeScene: gdjs.RuntimeScene,
       displayLoader: boolean
     ) => {
-      if (displayLoader) {
-        gdjs.multiplayerComponents.displayLoader(runtimeScene, true);
-      }
+      if (_isJoiningOrStartingAGame) return;
+
       const _gameId = gdjs.projectData.properties.projectUuid;
       if (!_gameId) {
         handleLobbiesError(
@@ -1627,12 +1626,14 @@ namespace gdjs {
         );
         return;
       }
+
       _isJoiningOrStartingAGame = true;
+      if (displayLoader) {
+        gdjs.multiplayerComponents.displayLoader(runtimeScene, true);
+      }
 
       const quickJoinLobbyRelativeUrl = `/play/game/${_gameId}/public-lobby/action/quick-join`;
 
-      // TODO: Protect against the action sent once per frame.
-
       try {
         const quickJoinLobbyResponse: QuickJoinLobbyResponse = await gdjs.evtTools.network.retryIfFailed(
           { times: 2 },