Merge branch 'jgrpp' into jgrpp-nrt

2019-07-13 20:35:17 +01:00
parent d3e0c3787f 8b1fb60dea
commit 1365600bed
8 changed files with 32 additions and 5 deletions
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2657,6 +2657,9 @@ static inline void ClearSaveLoadState()

 	delete _sl.lf;
 	_sl.lf = nullptr;
+
+	extern void GamelogStopActionIfStarted();
+	GamelogStopActionIfStarted();
 }

 /**