From 0f6c5ee622e80522840df22c70b39cfa9482a0b2 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 11 Jul 2019 03:12:44 +0100
Subject: [PATCH] Fix saveload exception handling when gamelog action in
 progress

---
 src/gamelog.cpp           | 5 +++++
 src/saveload/saveload.cpp | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/gamelog.cpp b/src/gamelog.cpp
index 46f86bcadf..8a809bd18f 100644
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -65,6 +65,11 @@ void GamelogStopAction()
 	if (print) GamelogPrintDebug(5);
 }
 
+void GamelogStopActionIfStarted()
+{
+	if (_gamelog_action_type != GLAT_NONE) GamelogStopAction();
+}
+
 /**
  * Frees the memory allocated by a gamelog
  */
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index c76bfa67d8..6711b947b1 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2663,6 +2663,9 @@ static inline void ClearSaveLoadState()
 
 	delete _sl.lf;
 	_sl.lf = nullptr;
+
+	extern void GamelogStopActionIfStarted();
+	GamelogStopActionIfStarted();
 }
 
 /**