From 873eac46e811f59d63ce61d211111976a1d26daa Mon Sep 17 00:00:00 2001
From: Timmy Weerwag <timmy@timmyweerwag.nl>
Date: Fri, 20 Feb 2015 02:10:13 +0100
Subject: [PATCH] Restart title music if necessary

---
 src/audio/audio.c     | 3 ++-
 src/windows/options.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/audio/audio.c b/src/audio/audio.c
index 544299a363..b8f0af5a9c 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -1556,7 +1556,8 @@ void start_title_music()
 		break;
 	}
 
-	if ((RCT2_GLOBAL(0x009AF284, uint32) & (1 << 0)) && RCT2_GLOBAL(0x009AF59D, uint8) & 1 && RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & 1) {
+	if ((RCT2_GLOBAL(0x009AF284, uint32) & (1 << 0)) && RCT2_GLOBAL(0x009AF59D, uint8) & 1
+			&& RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TITLE_DEMO) {
 		if (!RCT2_GLOBAL(0x009AF600, uint8)) {
 #ifdef USE_MIXER
 			gTitleMusicChannel = Mixer_Play_Music(musicPathId);
diff --git a/src/windows/options.c b/src/windows/options.c
index da09393fdf..edfbafea79 100644
--- a/src/windows/options.c
+++ b/src/windows/options.c
@@ -566,6 +566,10 @@ static void window_options_dropdown()
 			config_save_default();
 			window_invalidate(w);
 		}
+
+		stop_title_music();
+		if (dropdownIndex != 0)
+			start_title_music();
 		break;
 	case WIDX_CURRENCY_DROPDOWN:
 		gConfigGeneral.currency_format = (sint8)dropdownIndex;