mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23430) -Fix (r23219): also consider the old directories when playing a song

release/1.2
glx 2011-12-04 14:17:51 +00:00
parent 8b5d315d2a
commit 634796b860
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/music_gui.cpp
View File

@ -178,8 +178,9 @@ static void MusicVolumeChanged(byte new_vol)
static void DoPlaySong() static void DoPlaySong()
{ {
char filename[MAX_PATH]; char filename[MAX_PATH];
FioFindFullPath(filename, lengthof(filename), BASESET_DIR, if (FioFindFullPath(filename, lengthof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) {
BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); FioFindFullPath(filename, lengthof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename);
}
_music_driver->PlaySong(filename); _music_driver->PlaySong(filename);
SetWindowDirty(WC_MUSIC_WINDOW, 0); SetWindowDirty(WC_MUSIC_WINDOW, 0);
} }