Merge branch 'master' into jgrpp

# Conflicts:
#	src/gamelog.cpp

src/saveload/saveload.cpp

@@ -403,6 +403,10 @@ void NORETURN SlError(StringID string, const char *extra_msg, bool already_mallo
 	 * when we access them during cleaning the pool dereferences of
 	 * those indices will be made with segmentation faults as result. */
 	if (_sl.action == SLA_LOAD || _sl.action == SLA_PTRS) SlNullPointers();
+
+	/* Logging could be active. */
+	GamelogStopAnyAction();
+
 	throw std::exception();
 }
 
@@ -2873,8 +2877,7 @@ static inline void ClearSaveLoadState()
 	delete _sl.lf;
 	_sl.lf = nullptr;
 
-	extern void GamelogStopActionIfStarted();
-	GamelogStopActionIfStarted();
+	GamelogStopAnyAction();
 }
 
 /**