Mercurial > hg > openttd

changeset 18585:d70925444635 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23430) -Fix (r23219): also consider the old directories when playing a song
author glx <glx@openttd.org>
date Sun, 04 Dec 2011 14:17:51 +0000
parents 8e0f5c31ae22
children 7f20ee9327bc
files src/music_gui.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -178,8 +178,9 @@
 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);
 }