From 9f6a944174d3f8842e4d24394093b9f427293a13 Mon Sep 17 00:00:00 2001 From: r0 Date: Wed, 21 Aug 2019 23:36:07 +0200 Subject: [PATCH] Fix #9603: Don't render audio when master volume is turned off (#9907) --- distribution/changelog.txt | 1 + src/openrct2-ui/audio/AudioMixer.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 637fa4ff8d..91cded86b3 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -11,6 +11,7 @@ - Fix: [#9669] The tile inspector shortcut key does not work with debugging tools disabled. - Fix: [#9717] Scroll bars do not render correctly when using OpenGL renderer. - Fix: [#9729] Peeps do not take into account height difference when deciding to pathfind to a ride entrance. (original bug) +- Fix: [#9603] Don't render audio when master volume is turned off - Improved: [#9466] Add the rain weather effect to the OpenGL renderer. 0.2.3 (2019-07-10) diff --git a/src/openrct2-ui/audio/AudioMixer.cpp b/src/openrct2-ui/audio/AudioMixer.cpp index b34ae34815..3295cc7c50 100644 --- a/src/openrct2-ui/audio/AudioMixer.cpp +++ b/src/openrct2-ui/audio/AudioMixer.cpp @@ -223,7 +223,8 @@ namespace OpenRCT2::Audio { auto channel = *it; int32_t group = channel->GetGroup(); - if (group != MIXER_GROUP_SOUND || gConfigSound.sound_enabled) + if ((group != MIXER_GROUP_SOUND || gConfigSound.sound_enabled) && gConfigSound.master_sound_enabled + && gConfigSound.master_volume != 0) { MixChannel(channel, dst, length); }