Ensure game is shutdown if server throws exception (#9742)

p-ouellette · web-flow · commit 49ed0ca00a9a · 2020-04-25T09:42:18.000+02:00
diff --git 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();
 }

Original file line number	Diff line number	Diff line change
`@@ -4284,7 +4284,6 @@ void the_game(bool *kill,`
`4284`	`4284`	`reconnect_requested, &chat_backend, gamespec,`
`4285`	`4285`	`simple_singleplayer_mode)) {`
`4286`	`4286`	`game.run();`
`4287`		`- game.shutdown();`
`4288`	`4287`	`}`
`4289`	`4288`
`4290`	`4289`	`} catch (SerializationError &e) {`
`@@ -4300,4 +4299,5 @@ void the_game(bool *kill,`
`4300`	`4299`	`strgettext("\nCheck debug.txt for details.");`
`4301`	`4300`	`errorstream << error_message << std::endl;`
`4302`	`4301`	`}`
	`4302`	`+ game.shutdown();`
`4303`	`4303`	`}`