From 9bb978486b102dc751922c6d5f4e729e264c2887 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Oct 2011 17:50:19 +1000
Subject: COMMON: Fix multiple engines asserting in querySaveMetaInfos for
 empty save slots

---
 engines/tsage/detection.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 8a4b834f46..3395205234 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -156,22 +156,25 @@ public:
 	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const {
 		Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(
 			generateGameStateFileName(target, slot));
-		assert(f);
+		
+		if (f) {
+			TsAGE::tSageSavegameHeader header;
+			TsAGE::Saver::readSavegameHeader(f, header);
+			delete f;
+
+			// Create the return descriptor
+			SaveStateDescriptor desc(slot, header.saveName);
+			desc.setDeletableFlag(true);
+			desc.setWriteProtectedFlag(false);
+			desc.setThumbnail(header.thumbnail);
+			desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
+			desc.setSaveTime(header.saveHour, header.saveMinutes);
+			desc.setPlayTime(header.totalFrames * GAME_FRAME_TIME);
+
+			return desc;
+		}
 
-		TsAGE::tSageSavegameHeader header;
-		TsAGE::Saver::readSavegameHeader(f, header);
-		delete f;
-
-		// Create the return descriptor
-		SaveStateDescriptor desc(slot, header.saveName);
-		desc.setDeletableFlag(true);
-		desc.setWriteProtectedFlag(false);
-		desc.setThumbnail(header.thumbnail);
-		desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay);
-		desc.setSaveTime(header.saveHour, header.saveMinutes);
-		desc.setPlayTime(header.totalFrames * GAME_FRAME_TIME);
-
-		return desc;
+		return SaveStateDescriptor();
 	}
 };
 
-- 
cgit v1.2.3