[Scummvm-cvs-logs] scummvm master -> d01d228ee89d2e5c671dec825bbec50c3b6cf50c

bluegr md5 at scummvm.org
Sun Sep 25 14:09:37 CEST 2011


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:
d01d228ee8 AGI/COMMON: Fixed bug #3407308 - "AGI: SQ2: Saving allowed in autosave slot 0 from scummvmmenu"


Commit: d01d228ee89d2e5c671dec825bbec50c3b6cf50c
    https://github.com/scummvm/scummvm/commit/d01d228ee89d2e5c671dec825bbec50c3b6cf50c
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-25T05:03:02-07:00

Commit Message:
AGI/COMMON: Fixed bug #3407308 - "AGI: SQ2: Saving allowed in autosave slot 0 from scummvmmenu"

The save/load dialog code was not polling for meta info for empty slots

Changed paths:
    engines/agi/detection.cpp
    gui/saveload.cpp



diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 5141ab7..ddd8349 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -306,9 +306,11 @@ SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int sl
 		delete in;
 
 		return desc;
+	} else {
+		SaveStateDescriptor emptySave(slot, "");
+		emptySave.setWriteProtectedFlag(slot == 0);
+		return emptySave;
 	}
-
-	return SaveStateDescriptor();
 }
 
 const ADGameDescription *AgiMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const {
diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 02ddf81..ae950a2 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -240,7 +240,7 @@ void SaveLoadChooser::updateSelection(bool redraw) {
 	_time->setLabel(_("No time saved"));
 	_playtime->setLabel(_("No playtime saved"));
 
-	if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) {
+	if (selItem >= 0 && _metaInfoSupport) {
 		SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot());
 
 		isDeletable = desc.getDeletableFlag() && _delSupport;






More information about the Scummvm-git-logs mailing list