From f1a41e4f77ce272e8e454710a7a168d95466742c Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 19 Apr 2015 19:49:31 +0200 Subject: [PATCH] Disable connection timeout for singleplayer and server tabs In worlds with many mods we can easily reach timeout, waiting for the server to start. --- src/game.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game.cpp b/src/game.cpp index 24ecc99d2..3dcfcfaa9 100644 --- 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;