diff options
| author | rubidium <rubidium@openttd.org> | 2010-04-19 09:34:56 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-04-19 09:34:56 +0000 |
| commit | 83e40b8cedce5172142961df86abfb002f0cb272 (patch) | |
| tree | effccac42eb4fb323d1104f570628c15b910fabd /src/music.cpp | |
| parent | 3442b8c3456b2fdbf50b3b05a2f8840ebd53218c (diff) | |
| download | openttd-83e40b8cedce5172142961df86abfb002f0cb272.tar.xz | |
(svn r19674) -Fix [FS#3774]: crash when the music/graphics metadata files were unreadable
Diffstat (limited to 'src/music.cpp')
| -rw-r--r-- | src/music.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/music.cpp b/src/music.cpp index c4f15cc39..a6c8ea78f 100644 --- a/src/music.cpp +++ b/src/music.cpp @@ -57,9 +57,9 @@ template <class Tbase_set> return BaseMedia<Tbase_set>::used_set != NULL; } -bool MusicSet::FillSetDetails(IniFile *ini, const char *path) +bool MusicSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename) { - bool ret = this->BaseSet<MusicSet, NUM_SONGS_AVAILABLE, GM_DIR>::FillSetDetails(ini, path); + bool ret = this->BaseSet<MusicSet, NUM_SONGS_AVAILABLE, GM_DIR>::FillSetDetails(ini, path, full_filename); if (ret) { this->num_available = 0; IniGroup *names = ini->GetGroup("names"); @@ -93,5 +93,5 @@ bool MusicSet::FillSetDetails(IniFile *ini, const char *path) this->num_available++; } } - return true; + return ret; } |