From: Craig Robbins <kde.psych@gmail.com>
Date: Sat, 13 Dec 2014 14:00:52 +0000 (+1000)
Subject: Fix misleading error when exiting the client from the main menu
X-Git-Tag: 0.4.11~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b5e11e0e9adf65cc756dc6403d511f51f4122e3a;p=oweals%2Fminetest.git

Fix misleading error when exiting the client from the main menu
---

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 \""