Disable connection timeout for singleplayer and server tabs

In worlds with many mods we can easily reach timeout, waiting for the server to start.
minetest · Apr 19, 2015 · f1a41e4f77ce272e8e454710a7a168d95466742c · f1a41e4
1 parent a615da6
commit f1a41e4f77ce272e8e454710a7a168d95466742c
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 src/game.cpp
diff --git 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;