From 83e40b8cedce5172142961df86abfb002f0cb272 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 19 Apr 2010 09:34:56 +0000 Subject: (svn r19674) -Fix [FS#3774]: crash when the music/graphics metadata files were unreadable --- src/gfxinit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gfxinit.cpp') diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 6ba87eee1..42043299f 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -202,9 +202,9 @@ void GfxLoadSprites() GfxInitPalettes(); } -bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path) +bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename) { - bool ret = this->BaseSet::FillSetDetails(ini, path, false); + bool ret = this->BaseSet::FillSetDetails(ini, path, full_filename, false); if (ret) { IniGroup *metadata = ini->GetGroup("metadata"); IniItem *item; @@ -212,7 +212,7 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path) fetch_metadata("palette"); this->palette = (*item->value == 'D' || *item->value == 'd') ? PAL_DOS : PAL_WINDOWS; } - return true; + return ret; } -- cgit v1.2.3-54-g00ecf