From 75e0c94082dd1f252d754ef747aa197cc58a1ce2 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 30 Apr 2017 18:03:25 +0100
Subject: [PATCH] Fix mute / unmute logic

---
 src/openrct2/audio/audio.cpp       | 9 ++++-----
 src/openrct2/windows/top_toolbar.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/audio/audio.cpp b/src/openrct2/audio/audio.cpp
index d5efc2cabd..2f88b8e5a9 100644
--- a/src/openrct2/audio/audio.cpp
+++ b/src/openrct2/audio/audio.cpp
@@ -398,12 +398,11 @@ void audio_close()
 	gAudioCurrentDevice = -1;
 }
 
-void audio_toggle_all_sounds(){
-	gConfigSound.sound_enabled = !gConfigSound.sound_enabled;
-	if (gConfigSound.sound_enabled)
+void audio_toggle_all_sounds()
+{
+	if (gGameSoundsOff) {
 		audio_unpause_sounds();
-	else {
-		audio_stop_title_music();
+	} else {
 		audio_pause_sounds();
 	}
 }
diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c
index 4a0c4991a6..60b1e2659e 100644
--- a/src/openrct2/windows/top_toolbar.c
+++ b/src/openrct2/windows/top_toolbar.c
@@ -790,7 +790,7 @@ static void window_top_toolbar_invalidate(rct_window *w)
 	else
 		w->pressed_widgets &= ~(1 << WIDX_PAUSE);
 
-	if (gConfigSound.sound_enabled)
+	if (!gGameSoundsOff)
 		window_top_toolbar_widgets[WIDX_MUTE].image = 0x20000000 | SPR_G2_TOOLBAR_MUTE;
 	else
 		window_top_toolbar_widgets[WIDX_MUTE].image = 0x20000000 | SPR_G2_TOOLBAR_UNMUTE;