summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-10-14 19:46:00 +0000
committerrubidium <rubidium@openttd.org>2007-10-14 19:46:00 +0000
commit835a9670af57436c165718c6df1d86020b862c14 (patch)
tree9c2d166191a4e9ca42a88e5ada7d89debf8545c2
parentedc2a62669516a58165e670fecafdcf7e2bc9a5f (diff)
downloadopenttd-835a9670af57436c165718c6df1d86020b862c14.tar.xz
(svn r11259) -Fix [FS#1331]: the wrong song was played in the first intro game of a single OTTD session.
-rw-r--r--src/music_gui.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 2e6889f07..03b761062 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -174,7 +174,11 @@ void MusicLoop()
if (!msf.playing && _song_is_active) {
StopMusic();
} else if (msf.playing && !_song_is_active) {
- PlayPlaylistSong();
+ if (_game_mode != GM_MENU) {
+ PlayPlaylistSong();
+ } else {
+ ResetMusic();
+ }
}
if (!_song_is_active) return;