[Scummvm-git-logs] scummvm master -> 168b3e2c6bb33f96ee406acb201ea7493ce6a923

[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:
168b3e2c6b ULTIMA8: Don't save while starting up


Commit: 168b3e2c6bb33f96ee406acb201ea7493ce6a923
    https://github.com/scummvm/scummvm/commit/168b3e2c6bb33f96ee406acb201ea7493ce6a923
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-02-24T18:12:18-08:00

Commit Message:
ULTIMA8: Don't save while starting up

This fixes the direct loading of save games from the ScummVM menu by
blocking autosave during the startup.

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


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index fabcca4db8..c477e3d01a 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -38,6 +38,7 @@
 #include "ultima/ultima8/conf/config_file_manager.h"
 #include "ultima/ultima8/kernel/object_manager.h"
 #include "ultima/ultima8/games/game_info.h"
+#include "ultima/ultima8/games/start_u8_process.h"
 #include "ultima/ultima8/graphics/fonts/font_manager.h"
 #include "ultima/ultima8/kernel/memory_manager.h"
 #include "ultima/ultima8/kernel/hid_manager.h"
@@ -979,6 +980,10 @@ bool Ultima8Engine::canSaveGameStateCurrently(bool isAutosave) {
 		// Can't save when a modal gump is open
 		return false;
 
+	if (_kernel->getRunningProcess()->IsOfType(StartU8Process::ClassType))
+		// Don't save while starting up.
+		return false;
+
 	// Don't allow saving when avatar is dead.
 	MainActor *av = getMainActor();
 	if (!av || (av->getActorFlags() & Actor::ACT_DEAD))