aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2014-12-14 00:00:52 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-14 00:07:44 +1000
commitb5e11e0e9adf65cc756dc6403d511f51f4122e3a (patch)
treebd4348731599d68d00fbf3076496368b56a2b796
parent784a452ed52ca3a8b46997c7f787b04a3a07b7d5 (diff)
downloadminetest-b5e11e0e9adf65cc756dc6403d511f51f4122e3a.tar.gz
minetest-b5e11e0e9adf65cc756dc6403d511f51f4122e3a.tar.bz2
minetest-b5e11e0e9adf65cc756dc6403d511f51f4122e3a.zip
Fix misleading error when exiting the client from the main menu
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 73964c2b0..ed9800f00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1937,6 +1937,10 @@ bool ClientLauncher::launch_game(std::wstring *error_message,
errorstream << wide_to_narrow(*error_message) << std::endl;
return false;
}
+
+ if (porting::signal_handler_killstatus())
+ return true;
+
if (game_params.game_spec.isValid() &&
game_params.game_spec.id != worldspec.gameid) {
errorstream << "WARNING: Overriding gamespec from \""