thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: Ensure there is no recursive call to auto-save

Browse source
This commit is contained in:
Thierry Crozat 2021-06-28 22:41:06 +01:00 • committed by Paul Gilbert
parent 3533403d8a
commit 73bb1e548b
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/engine.cpp
View file

@ -530,6 +530,11 @@ void Engine::handleAutoSave() {
} }
void Engine::saveAutosaveIfEnabled() { void Engine::saveAutosaveIfEnabled() {
// Reset the last autosave time first.
// Doing it here rather than after saving the game prevents recursive calls if saving the game
// causes the engine to poll events (as is the case with the AGS engine for example).
_lastAutosaveTime = _system->getMillis();
if (_autosaveInterval != 0) { if (_autosaveInterval != 0) {
bool saveFlag = canSaveAutosaveCurrently(); bool saveFlag = canSaveAutosaveCurrently();
@ -549,13 +554,9 @@ void Engine::saveAutosaveIfEnabled() {
if (!saveFlag) { if (!saveFlag) {
// Set the next autosave interval to be in 5 minutes, rather than whatever // Set the next autosave interval to be in 5 minutes, rather than whatever
// full autosave interval the user has selected // full autosave interval the user has selected
_lastAutosaveTime = _system->getMillis() + (5 * 60 * 1000) - _autosaveInterval; _lastAutosaveTime += (5 * 60 * 1000) - _autosaveInterval;
return;
} }
} }
// Reset the last autosave time
_lastAutosaveTime = _system->getMillis();
} }
void Engine::errorString(const char *buf1, char *buf2, int size) { void Engine::errorString(const char *buf1, char *buf2, int size) {