From 3f9ce057f75e9188e5bd5e7a5c4e2a369e4dc3ee Mon Sep 17 00:00:00 2001 From: David Schoemehl Date: Sun, 29 Jan 2023 16:00:54 -0600 Subject: [PATCH] Fix #1763: Title music does not stop when unchecked in options window (#1774) --- CHANGELOG.md | 2 ++ src/OpenLoco/src/Windows/Options.cpp | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a1bb0778a..792e25328e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ 23.01+ (???) ------------------------------------------------------------------------ +- Fix: [#1763] Title music does not stop when unchecked in options window. +- Fix: [#1772] Toggling edge scrolling option does not work. 23.01 (2023-01-25) ------------------------------------------------------------------------ diff --git a/src/OpenLoco/src/Windows/Options.cpp b/src/OpenLoco/src/Windows/Options.cpp index 799cd9b50c..a181835c4b 100644 --- a/src/OpenLoco/src/Windows/Options.cpp +++ b/src/OpenLoco/src/Windows/Options.cpp @@ -858,13 +858,21 @@ namespace OpenLoco::Ui::Windows::Options auto& cfg = Config::get(); cfg.audio.playTitleMusic = !cfg.audio.playTitleMusic; Config::write(); + w->invalidate(); + + if (!isTitleMode()) + { + return; + } if (cfg.audio.playTitleMusic) { Audio::playMusic(Environment::PathId::css5, Config::get().old.volume, true); } - - w->invalidate(); + else + { + Audio::stopMusic(); + } } // 0x004C04E0