diff options
| author | rubidium <rubidium@openttd.org> | 2014-04-23 21:23:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-04-23 21:23:21 +0000 |
| commit | 21f991e2353d99064555acf7996b51c46bbd44a5 (patch) | |
| tree | 98bcaf86aac6edddf70877a13a71b8337049254d /src/music_gui.cpp | |
| parent | 160ad31028c6d089ee9bc69581c9a25da00912aa (diff) | |
| download | openttd-21f991e2353d99064555acf7996b51c46bbd44a5.tar.xz | |
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
Diffstat (limited to 'src/music_gui.cpp')
| -rw-r--r-- | src/music_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 01406849f..c9eb21aa3 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -182,8 +182,8 @@ static void MusicVolumeChanged(byte new_vol) static void DoPlaySong() { char filename[MAX_PATH]; - if (FioFindFullPath(filename, lengthof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) { - FioFindFullPath(filename, lengthof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); + if (FioFindFullPath(filename, lastof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) { + FioFindFullPath(filename, lastof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); } _music_driver->PlaySong(filename); SetWindowDirty(WC_MUSIC_WINDOW, 0); |