From 917e93e63354d7ef7365dfe29815b457ad0e79a8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 23 Sep 2010 06:14:30 +0000 Subject: [PATCH] - fixed: The check for savegames without picture was reversed. - fixed: Savegames that were saved without picture did not display the 'No picture' message because the empty PNG container was still recognized as image. SVN r2847 (trunk) --- src/menu/loadsavemenu.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp index d0ac38894f..be59acdb68 100644 --- a/src/menu/loadsavemenu.cpp +++ b/src/menu/loadsavemenu.cpp @@ -506,8 +506,12 @@ void DLoadSaveMenu::ExtractSaveData (int index) // Extract pic SavePic = PNGTexture_CreateFromFile(png, node->Filename); - delete png; + if (SavePic->GetWidth() == 1 && SavePic->GetHeight() == 1) + { + delete SavePic; + SavePic = NULL; + } } fclose (file); } @@ -551,7 +555,7 @@ void DLoadSaveMenu::Drawer () if (SaveGames.Size() > 0) { const char *text = - (Selected == -1 || SaveGames[Selected]->bOldVersion) + (Selected == -1 || !SaveGames[Selected]->bOldVersion) ? GStrings("MNU_NOPICTURE") : GStrings("MNU_DIFFVERSION"); const int textlen = SmallFont->StringWidth (text)*CleanXfac;