Ticket #3570: 3570.2.2.diff

binaries/data/mods/public/gui/common/network.js

@@ -4 +4 @@
  * @param reason {number}
  * @returns {string}
  */
-function getDisconnectReason(id)
+function getDisconnectReason(id, wasConnected)
 {
     // Must be kept in sync with source/network/NetHost.h
     switch (id)
     {
-    case 0: return translate("Unknown reason");
+    case 0: 
+        if (wasConnected)
+            return translate("Unknow reason.");
+        else
+            return translate("This is generally due to port 20595 not being forwarded on the host side. Also, check if you have any firewall or anti-virus blocking the connection.");
     case 1: return translate("Unexpected shutdown");
     case 2: return translate("Incorrect network protocol version");
     case 3: return translate("Game is loading, please try later");
@@ -25 +29 @@
  *
  * @param {number} reason
  */
-function reportDisconnect(reason)
+function reportDisconnect(reason, wasConnected)
 {
     // Translation: States the reason why the client disconnected from the server.
-    var reasonText = sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(reason) })
-    messageBox(400, 200, translate("Lost connection to the server.") + "\n\n" + reasonText, translate("Disconnected"), 2);
+    var reasonText = sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(reason, wasConnected) })
+    if (wasConnected)
+        messageBox(400, 200, translate("Lost connection to the server.") + "\n\n" + reasonText, translate("Disconnected"), 2);
 }
 
 /**

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

@@ -424 +424 @@
         {
         case "disconnected":
             cancelSetup();
-            reportDisconnect(message.reason);
+            reportDisconnect(message.reason, true);
             break;
 
         default:

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

@@ -90 +90 @@
                 {
                 case "disconnected":
                     cancelSetup();
-                    reportDisconnect(message.reason);
+                    reportDisconnect(message.reason, false);
                     return;
 
                 default:
@@ -161 +161 @@
 
                 case "disconnected":
                     cancelSetup();
-                    reportDisconnect(message.reason);
+                    reportDisconnect(message.reason, false);
                     return;
 
                 default:

binaries/data/mods/public/gui/session/messages.js

@@ -270 +270 @@
         case "disconnected":
             g_Disconnected = true;
             // Translation: States the reason why the client disconnected from the server.
-            let reason = sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(message.reason) });
+            let reason = sprintf(translate("Reason: %(reason)s."), { "reason": getDisconnectReason(message.reason, true) });
             obj.caption = translate("Connection to the server has been lost.") + "\n" + reason + "\n" + translate("The game has ended.");
             obj.hidden = false;
             break;