aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Piveteau <chripiveteau@gmail.com>2014-12-28 16:52:51 +0100
committerkwolekr <kwolekr@minetest.net>2014-12-28 22:46:53 -0500
commit91c00d29a53a944d910d2adb40c25188a37749ed (patch)
treead3c7a46f954833e6ee27034d9fd5b94d69b5a8d
parent863379a4c68b9862ea6913c1b1e475d022aba100 (diff)
downloadminetest-91c00d29a53a944d910d2adb40c25188a37749ed.tar.gz
minetest-91c00d29a53a944d910d2adb40c25188a37749ed.tar.bz2
minetest-91c00d29a53a944d910d2adb40c25188a37749ed.zip
Skip further loading of client if there was an exit signal
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0c5f73b23..cc89d32ac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1859,6 +1859,10 @@ bool ClientLauncher::launch_game(std::wstring *error_message,
if (!skip_main_menu) {
main_menu(&menudata);
+ // Skip further loading if there was an exit signal.
+ if (*porting::signal_handler_killstatus())
+ return false;
+
address = menudata.address;
int newport = stoi(menudata.port);
if (newport != 0)