[Scummvm-git-logs] scummvm master -> 08bbef8f7d62c485105908a024acdd836329ca18

[bonki]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2bbed8146f TUCKER: Try autosaving only once per autosave interval
08bbef8f7d TUCKER: Improve autosave error handling


Commit: 2bbed8146fec101db4e5f39ba35b2bb2536389c5
    https://github.com/scummvm/scummvm/commit/2bbed8146fec101db4e5f39ba35b2bb2536389c5
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-04-21T15:45:34+02:00

Commit Message:
TUCKER: Try autosaving only once per autosave interval

Changed paths:
    engines/tucker/saveload.cpp


diff --git a/engines/tucker/saveload.cpp b/engines/tucker/saveload.cpp
index af83659..1720e10 100644
--- a/engines/tucker/saveload.cpp
+++ b/engines/tucker/saveload.cpp
@@ -286,13 +286,16 @@ bool TuckerEngine::isAutosaveAllowed(const char *target) {
 
 void TuckerEngine::writeAutosave() {
 	if (canSaveGameStateCurrently()) {
+		// unconditionally reset last autosave timestamp so we don't start
+		// hammering the disk in case we can't/don't actually write the file
+		_lastSaveTime = _system->getMillis();
+
 		if (!isAutosaveAllowed()) {
 			warning("Refusing to overwrite non-autosave savegame in slot %i, skipping autosave", kAutoSaveSlot);
 			return;
 		}
 
 		writeSavegame(kAutoSaveSlot, "Autosave", true);
-		_lastSaveTime = _system->getMillis();
 	}
 }
 


Commit: 08bbef8f7d62c485105908a024acdd836329ca18
    https://github.com/scummvm/scummvm/commit/08bbef8f7d62c485105908a024acdd836329ca18
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-04-21T16:02:51+02:00

Commit Message:
TUCKER: Improve autosave error handling

Changed paths:
    engines/tucker/saveload.cpp


diff --git a/engines/tucker/saveload.cpp b/engines/tucker/saveload.cpp
index 1720e10..00911b9 100644
--- a/engines/tucker/saveload.cpp
+++ b/engines/tucker/saveload.cpp
@@ -295,7 +295,10 @@ void TuckerEngine::writeAutosave() {
 			return;
 		}
 
-		writeSavegame(kAutoSaveSlot, "Autosave", true);
+		if (writeSavegame(kAutoSaveSlot, "Autosave", true).getCode() != Common::kNoError) {
+			warning("Can't create autosave in slot %i, game not saved", kAutoSaveSlot);
+			return;
+		}
 	}
 }