Ticket #3739: lobby_ask_observer_join_v1.patch

binaries/data/mods/public/gui/lobby/lobby.js

@@ -608 +608 @@
 }
 
 /**
  * Start the joining process on the currectly selected game.
  */
-function joinSelectedGame()
+function joinButton()
+{
+    let game = selectedGame();
+    if (!game)
+        return;
+
+    let username = g_UserRating ? g_Username + " (" + g_UserRating + ")" : g_Username;
+
+    if (game.state == "init" || game.players.split(", ").indexOf(username) > -1)
+        joinSelectedGame();
+    else
+        messageBox(
+            400, 200,
+            translate("The game has already started.") + "\n" + translate("Do you want to join as observer?"),
+            translate("Confirmation"),
+            0,
+            [translate("No"), translate("Yes")],
+            [null, joinSelectedGame]
+        );
+}
+
+function selectedGame()
 {
     var gamesBox = Engine.GetGUIObjectByName("gamesBox");
     if (gamesBox.selected < 0)
+        return undefined;
+
+    return g_GameList[gamesBox.list_data[gamesBox.selected]];
+}
+
+function joinSelectedGame()
+{
+    let game = selectedGame();
+    if (!game)
         return;
 
-    var ipAddress = g_GameList[gamesBox.list_data[gamesBox.selected]].ip;
-    if (ipAddress.split('.').length != 4)
+    if (game.ip.split('.').length != 4)
     {
-        addChatMessage({ "from": "system", "text": sprintf(translate("This game's address '%(ip)s' does not appear to be valid."), { "ip": ipAddress }) });
+        addChatMessage({
+            "from": "system",
+            "text": sprintf(
+                translate("This game's address '%(ip)s' does not appear to be valid."),
+                { "ip": game.ip }
+            )
+        });
         return;
     }
 
-    Engine.PushGuiPage("page_gamesetup_mp.xml", { "multiplayerGameType": "join", "name": g_Username, "ip": ipAddress, "rating": g_UserRating });
+    Engine.PushGuiPage("page_gamesetup_mp.xml", {
+        "multiplayerGameType": "join",
+        "ip": game.ip,
+        "name": g_Username,
+        "rating": g_UserRating
+    });
 }
 
 /**
  * Open the dialog box to enter the game name.
  */

binaries/data/mods/public/gui/lobby/lobby.xml

@@ -152 +152 @@
                 </object>
             </object>
             <object name="joinGameButton" type="button" style="ModernButtonRed" size="0 100%-85 100% 100%-60" hidden="true">
                 <translatableAttribute id="caption" comment="Join the game currently selected in the list.">Join Game</translatableAttribute>
                 <action on="Press">
-                    joinSelectedGame();
+                    joinButton();
                 </action>
             </object>
             <object name="hostButton" type="button" style="ModernButtonRed" size="0 100%-55 100% 100%-30">
                 <translatableAttribute id="caption">Host Game</translatableAttribute>
                 <action on="Press">
@@ -173 +173 @@
         <!-- Middle panel: Filters, game list, chat box. -->
         <object name="middlePanel" size="20%+5 5% 100%-255 97.2%">
             <object name="gamesBox" style="ModernList" sprite_asc="ModernArrowDown" default_column="status" default_column_order="1" sprite_desc="ModernArrowUp" sprite_not_sorted="ModernNotSorted" type="olist" sortable="true" size="0 25 100% 48%" font="sans-stroke-13">
                 <action on="SelectionChange">updateGameSelection();</action>
                 <action on="SelectionColumnChange">applyFilters();</action>
-                <action on="mouseleftdoubleclickitem">joinSelectedGame();</action>
+                <action on="mouseleftdoubleclickitem">joinButton();</action>
                 <def id="name" color="0 60 0" width="27%">
                     <translatableAttribute id="heading">Name</translatableAttribute>
                 </def>
                 <!--<def id="ip" heading="IP" color="0 128 128" width="170"/>-->
                 <def id="mapName" color="128 128 128" width="25%">