summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-18 18:14:14 +0000
committerrubidium <rubidium@openttd.org>2011-01-18 18:14:14 +0000
commit6a17bf91e3c436a5659fefcb0a2e156939e7a80c (patch)
treed8e709ced4bb676afbd27fa3be11701e1837f52f /src/saveload
parent3f900d3580fc4afd967df859e6dfdce664ff3ca9 (diff)
downloadopenttd-6a17bf91e3c436a5659fefcb0a2e156939e7a80c.tar.xz
(svn r21833) -Fix [FS#4427]: desync debug savegames might not be actually saved in case threading is enabled, which is enabled by default
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/saveload.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index b56fe4b2a..f4d59ca85 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2615,7 +2615,7 @@ SaveOrLoadResult LoadWithFilter(LoadFilter *reader)
SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, bool threaded)
{
/* An instance of saving is already active, so don't go saving again */
- if (_sl.saveinprogress && mode == SL_SAVE) {
+ if (_sl.saveinprogress && mode == SL_SAVE && threaded) {
/* if not an autosave, but a user action, show error message */
if (!_do_autosave) ShowErrorMessage(STR_ERROR_SAVE_STILL_IN_PROGRESS, INVALID_STRING_ID, WL_ERROR);
return SL_OK;