[Scummvm-cvs-logs] SF.net SVN: scummvm:[33639] scummvm/trunk/engines/scumm/dialogs.cpp

[fingolfin at users.sourceforge.net]

Revision: 33639
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33639&view=rev
Author:   fingolfin
Date:     2008-08-05 13:08:07 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
SCUMM: Don't try to load metadata for slot -1 (i.e. don't try to load metadata if nothing is selected)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/dialogs.cpp

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2008-08-05 13:06:13 UTC (rev 33638)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2008-08-05 13:08:07 UTC (rev 33639)
@@ -364,8 +364,9 @@
 
 void SaveLoadChooser::updateInfos(bool redraw) {
 	int selItem = _list->getSelected();
-	Graphics::Surface *thumb;
-	thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
+	Graphics::Surface *thumb = 0;
+	if (selItem >= 0)
+		thumb = _vm->loadThumbnailFromSlot(_saveMode ? selItem + 1 : selItem);
 
 	if (thumb) {
 		_gfxWidget->setGfx(thumb);
@@ -382,7 +383,7 @@
 	InfoStuff infos;
 	memset(&infos, 0, sizeof(InfoStuff));
 	char buffer[32];
-	if (_vm->loadInfosFromSlot(_saveMode ? selItem + 1 : selItem, &infos)) {
+	if (selItem >= 0 && _vm->loadInfosFromSlot(_saveMode ? selItem + 1 : selItem, &infos)) {
 		snprintf(buffer, 32, "Date: %.2d.%.2d.%.4d",
 			(infos.date >> 24) & 0xFF, (infos.date >> 16) & 0xFF,
 			infos.date & 0xFFFF);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.