Skip further loading of client if there was an exit signal

diff --git a/src/main.cpp b/src/main.cpp
index 0c5f73b23ae3ef7bec7c14d90759f5d4ad54e4be..cc89d32ac64fc52e84f1880802e230230c35f8c3 100644 (file)
--- 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)