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

This commit is contained in:
glx
2011-12-04 14:17:51 +00:00
parent 8576d825c7
commit a7cde1ebb1

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);
} }