Skip further loading of client if there was an exit signal

minetest · Dec 29, 2014 · 91c00d29a53a944d910d2adb40c25188a37749ed · 91c00d2
1 parent 863379a
commit 91c00d29a53a944d910d2adb40c25188a37749ed
Unified Split

Showing with 4 additions and 0 deletions.

+4 −0 src/main.cpp
diff --git 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)