cpp/openttd-patchpack/source Changeset - r17086:29019613596e

Changeset - r17086:29019613596e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 13 years ago 2011-01-18 18:14:14
rubidium@openttd.org

(svn r21833) -Fix [FS#4427]: desync debug savegames might not be actually saved in case threading is enabled, which is enabled by default

3 files changed with 3 insertions and 3 deletions:

src/genworld.cpp

src/openttd.cpp

src/saveload/saveload.cpp

0 comments (0 inline, 0 general)

src/genworld.cpp

➞

Show inline comments

@@ @@ -188,7 +188,7 @@ static void _GenerateWorld(void *) @@
 		if (_debug_desync_level > 0) {
 			char name[MAX_PATH];
 			snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
 			SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR);
+			SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR, false);
+		}
 	} catch (...) {
 		if (_cur_company.IsValid()) _cur_company.Restore();

src/openttd.cpp

➞

Show inline comments

@@ @@ -1258,7 +1258,7 @@ void StateGameLoop() @@
 			/* Save the desync savegame if needed. */
 			char name[MAX_PATH];
 			snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
 			SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR);
+			SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR, false);
+		}
 		CheckCaches();

src/saveload/saveload.cpp

➞

Show inline comments

@@ @@ -2615,7 +2615,7 @@ SaveOrLoadResult LoadWithFilter(LoadFilt @@
 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;

0 comments (0 inline, 0 general)