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

[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:
5a5aba9504 ULTIMA8: Fix startup when lastSave points to a save no longer present


Commit: 5a5aba9504c9235f976694e020130d5d968373ff
    https://github.com/scummvm/scummvm/commit/5a5aba9504c9235f976694e020130d5d968373ff
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-29T09:29:04-08:00

Commit Message:
ULTIMA8: Fix startup when lastSave points to a save no longer present

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


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 44592a1add..5462819361 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -1185,6 +1185,13 @@ void Ultima8Engine::setupCoreGumps() {
 bool Ultima8Engine::newGame(int saveSlot) {
 	debugN(MM_INFO, "Starting New Game...\n");
 
+	// First validate we still have a save file for the slot
+	if (saveSlot != -1) {
+		SaveStateDescriptor desc = getMetaEngine().querySaveMetaInfos(_targetName.c_str(), saveSlot);
+		if (desc.getSaveSlot() != saveSlot)
+			saveSlot = -1;
+	}
+
 	resetEngine();
 
 	setupCoreGumps();