[Scummvm-git-logs] scummvm master -> 8f9daa906c3a43d00ce004494a87cfe698aa9150

[bgK]

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:
3299402a23 HOHAWK: RIVEN: Don't allow autosaving after credits have finished
8f9daa906c Merge pull request #1257 from dafioram/mohawkRivenAutosaveCredits


Commit: 3299402a2319ab02299b3ae32dab91a6618a5e50
    https://github.com/scummvm/scummvm/commit/3299402a2319ab02299b3ae32dab91a6618a5e50
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-07-21T07:45:39-07:00

Commit Message:
HOHAWK: RIVEN: Don't allow autosaving after credits have finished

There is a brief period after the credits finish, but before the engine
closes that autosaving can happen.

Fixes Trac#10635.

Changed paths:
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 1f19b08..2f17d5e 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -737,7 +737,7 @@ void MohawkEngine_Riven::saveGameStateAndDisplayError(int slot, const Common::St
 }
 
 void MohawkEngine_Riven::tryAutoSaving() {
-	if (!canSaveGameStateCurrently() || !isGameStarted()) {
+	if (!canSaveGameStateCurrently() || !isGameStarted() || _gameEnded) {
 		return; // Can't save right now, try again on the next frame
 	}
 


Commit: 8f9daa906c3a43d00ce004494a87cfe698aa9150
    https://github.com/scummvm/scummvm/commit/8f9daa906c3a43d00ce004494a87cfe698aa9150
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-07-21T21:31:40+02:00

Commit Message:
Merge pull request #1257 from dafioram/mohawkRivenAutosaveCredits

MOHAWK: RIVEN: Don't allow autosaving during credits

Changed paths:
    engines/mohawk/riven.cpp