Disable connection timeout for singleplayer and server tabs

In worlds with many mods we can easily reach timeout, waiting for the server to start.

diff --git a/src/game.cpp b/src/game.cpp
index 24ecc99d2ab5c09144d6c30c1878043b1cb1bd2e..3dcfcfaa96035b22fffce62a40ef472ff0a26bdb 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2217,7 +2217,8 @@ bool Game::connectToServer(const std::string &playername,
                        }
 
                        wait_time += dtime;
-                       if (wait_time > 10) {
+                       // Only time out if we aren't waiting for the server we started
+                       if ((*address != "") && (wait_time > 10)) {
                                *error_message = "Connection timed out.";
                                errorstream << *error_message << std::endl;
                                break;