Disable connection timeout for singleplayer and server tabs

est31 · est31 · commit f1a41e4f77ce · 2015-04-19T19:58:21.000+02:00
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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -2217,7 +2217,8 @@ bool Game::connectToServer(const std::string &playername,`
`2217`	`2217`	`}`
`2218`	`2218`
`2219`	`2219`	`wait_time += dtime;`
`2220`		`- if (wait_time > 10) {`
	`2220`	`+ // Only time out if we aren't waiting for the server we started`
	`2221`	`+ if ((*address != "") && (wait_time > 10)) {`
`2221`	`2222`	`*error_message = "Connection timed out.";`
`2222`	`2223`	`errorstream << *error_message << std::endl;`
`2223`	`2224`	`break;`