From 49ed0ca00a9a79b5db0bd6cc4589d56d7f1b3d45 Mon Sep 17 00:00:00 2001
From: Paul Ouellette <oue.paul18@gmail.com>
Date: Sat, 25 Apr 2020 03:42:18 -0400
Subject: [PATCH] Ensure game is shutdown if server throws exception (#9742)

---
 src/client/game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 610522dc2..3bdac786c 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -4284,7 +4284,6 @@ void the_game(bool *kill,
 				reconnect_requested, &chat_backend, gamespec,
 				simple_singleplayer_mode)) {
 			game.run();
-			game.shutdown();
 		}
 
 	} catch (SerializationError &e) {
@@ -4300,4 +4299,5 @@ void the_game(bool *kill,
 				strgettext("\nCheck debug.txt for details.");
 		errorstream << error_message << std::endl;
 	}
+	game.shutdown();
 }