diff options
| author | est31 <MTest31@outlook.com> | 2015-04-19 19:49:31 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-04-19 19:58:21 +0200 |
| commit | f1a41e4f77ce272e8e454710a7a168d95466742c (patch) | |
| tree | 43e150ee0ae0b909be73c36e019639b8cfd874db /src | |
| parent | a615da6b12186c83b343dcf76d56e402252d4862 (diff) | |
| download | minetest-f1a41e4f77ce272e8e454710a7a168d95466742c.tar.gz minetest-f1a41e4f77ce272e8e454710a7a168d95466742c.tar.bz2 minetest-f1a41e4f77ce272e8e454710a7a168d95466742c.zip | |
Disable connection timeout for singleplayer and server tabs
In worlds with many mods we can easily reach timeout, waiting for the server to start.
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |