From d185b30ba01fd55053598cb6615d62406f699545 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Sun, 28 Dec 2014 16:52:51 +0100
Subject: [PATCH] Fixed issue #2007

---
 src/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 0c5f73b23..cc89d32ac 100644
--- 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)