[Scummvm-git-logs] scummvm master -> 5be4323ac02cbabc99dd3e8a937dc898c6f8dde1

[dreammaster]

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

Summary:
5be4323ac0 ULTIMA8: Don't perform autosaves when the avatar is in stasis


Commit: 5be4323ac02cbabc99dd3e8a937dc898c6f8dde1
    https://github.com/scummvm/scummvm/commit/5be4323ac02cbabc99dd3e8a937dc898c6f8dde1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-29T20:28:52-08:00

Commit Message:
ULTIMA8: Don't perform autosaves when the avatar is in stasis

This avoids a crash I had when autosave triggered whilst the
Docks execution cutscene was in progress

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 5462819361..33fbe736ce 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -979,8 +979,8 @@ void Ultima8Engine::writeSaveInfo(ODataSource *ods) {
 }
 
 bool Ultima8Engine::canSaveGameStateCurrently(bool isAutosave) {
-	if (_desktopGump->FindGump<ModalGump>())
-		// Can't save when a modal gump is open
+	if (_desktopGump->FindGump<ModalGump>() || _avatarInStasis)
+		// Can't save when a modal gump is open, or avatar in statsis  during cutscenes
 		return false;
 
 	if (_kernel->getRunningProcess() && _kernel->getRunningProcess()->IsOfType(StartU8Process::ClassType))