Ticket #4031: continue_mp_v3.patch

binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js

@@ -15 +15 @@
     case "join":
         if(Engine.HasXmppClient())
         {
+        Engine.GetGUIObjectByName("confirmButton").hidden = true;
             if (startJoin(attribs.name, attribs.ip))
                 switchSetupPage("pageJoin", "pageConnecting");
         }
@@ -56 +57 @@
 
 function confirmSetup()
 {
-    if (Engine.GetGUIObjectByName("pageHost").hidden)
+    if (!Engine.GetGUIObjectByName("pageJoin").hidden)
     {
         let joinPlayerName = Engine.GetGUIObjectByName("joinPlayerName").caption;
         let joinServer = Engine.GetGUIObjectByName("joinServer").caption;
@@ -63 +64 @@
         if (startJoin(joinPlayerName, joinServer))
             switchSetupPage("pageJoin", "pageConnecting");
     }
-    else
+    else if (!Engine.GetGUIObjectByName("pageHost").hidden)
     {
         let hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption;
         let hostServerName = Engine.GetGUIObjectByName("hostServerName").caption;

binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml

@@ -81 +81 @@
 
         <object name="hostFeedback" type="text" style="ModernLabelText" size="50 100%-90 100%-50 100%-50" textcolor="red" />
 
-        <object hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed">
+        <object name="confirmButton" hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed" hidden="false">
             <translatableAttribute id="caption">Continue</translatableAttribute>
             <action on="Press">confirmSetup();</action>
         </object>