Fix misleading error when exiting the client from the main menu
authorCraig Robbins <kde.psych@gmail.com>
Sat, 13 Dec 2014 14:00:52 +0000 (00:00 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Sat, 13 Dec 2014 14:07:44 +0000 (00:07 +1000)
src/main.cpp

index 73964c2b0d0208fb593593f32441ef32e55af57b..ed9800f00b5b381babb8f2487bd36b8339b4d611 100644 (file)
@@ -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 \""