From 634796b86059af099c2b75870d6bd006334a2c20 Mon Sep 17 00:00:00 2001 From: glx Date: Sun, 4 Dec 2011 14:17:51 +0000 Subject: (svn r23430) -Fix (r23219): also consider the old directories when playing a song --- src/music_gui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 2c9d474f8..846c2bcb6 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -178,8 +178,9 @@ static void MusicVolumeChanged(byte new_vol) static void DoPlaySong() { char filename[MAX_PATH]; - FioFindFullPath(filename, lengthof(filename), BASESET_DIR, - BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); + 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); + } _music_driver->PlaySong(filename); SetWindowDirty(WC_MUSIC_WINDOW, 0); } -- cgit v1.2.3-54-g00ecf