From ee5ab7978e2b5420acbf97a7c5be6729c5e1e4d9 Mon Sep 17 00:00:00 2001
From: MelonSpeedruns <melonspeedruns@outlook.com>
Date: Tue, 7 Apr 2026 13:56:23 -0400
Subject: [PATCH] Fixes audio volume at boot if changed (#270)

* Fixes audio volume at boot if changed

* Update Settings refactor for settings we want to update in the future

* remove unused include

---------

Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net>
---
 include/dusk/audio/DuskAudioSystem.h | 2 ++
 src/dusk/audio/DuskAudioSystem.cpp   | 6 ++++++
 src/dusk/imgui/ImGuiConsole.cpp      | 9 ++++++++-
 src/dusk/imgui/ImGuiConsole.hpp      | 1 +
 src/dusk/imgui/ImGuiMenuGame.cpp     | 3 ---
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/include/dusk/audio/DuskAudioSystem.h b/include/dusk/audio/DuskAudioSystem.h
index 1b31db6e7c..724776f5f1 100644
--- a/include/dusk/audio/DuskAudioSystem.h
+++ b/include/dusk/audio/DuskAudioSystem.h
@@ -8,6 +8,8 @@ namespace dusk::audio {
      */
     void Initialize();
 
+    void SetEnableReverb(bool value);
+
     void SetMasterVolume(f32 value);
 
     u32 GetResetCount(int channelIdx);
diff --git a/src/dusk/audio/DuskAudioSystem.cpp b/src/dusk/audio/DuskAudioSystem.cpp
index c7313749c2..7b464e4f0e 100644
--- a/src/dusk/audio/DuskAudioSystem.cpp
+++ b/src/dusk/audio/DuskAudioSystem.cpp
@@ -76,6 +76,12 @@ void dusk::audio::SetMasterVolume(const f32 value) {
     MasterVolume = value;
 }
 
+void dusk::audio::SetEnableReverb(const bool value) {
+    JASCriticalSection section;
+
+    EnableReverb = value;
+}
+
 void SDLCALL GetNewAudio(
     void*,
     SDL_AudioStream*,
diff --git a/src/dusk/imgui/ImGuiConsole.cpp b/src/dusk/imgui/ImGuiConsole.cpp
index fe5d3e7c9a..4329849800 100644
--- a/src/dusk/imgui/ImGuiConsole.cpp
+++ b/src/dusk/imgui/ImGuiConsole.cpp
@@ -15,6 +15,7 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "dusk/config.hpp"
 #include "dusk/settings.h"
+#include "dusk/audio/DuskAudioSystem.h"
 
 #if _WIN32
 #define NOMINMAX
@@ -178,13 +179,19 @@ namespace dusk {
 
     ImGuiConsole::ImGuiConsole() {}
 
+    void ImGuiConsole::UpdateSettings() {
+        dusk::audio::SetMasterVolume(dusk::getSettings().audio.masterVolume / 100.0f);
+        dusk::audio::SetEnableReverb(dusk::getSettings().audio.enableReverb);
+        getTransientSettings().skipFrameRateLimit = getSettings().game.enableTurboKeybind && ImGui::IsKeyDown(ImGuiKey_Tab);
+    }
+
     void ImGuiConsole::PreDraw() {
         if (!m_isLaunchInitialized) {
             m_toasts.emplace_back("Press F1 to toggle menu"s, 5.f);
             m_isLaunchInitialized = true;
         }
 
-        getTransientSettings().skipFrameRateLimit = getSettings().game.enableTurboKeybind && ImGui::IsKeyDown(ImGuiKey_Tab);
+        UpdateSettings();
         
         if ((ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) &&
             ImGui::IsKeyPressed(ImGuiKey_R))
diff --git a/src/dusk/imgui/ImGuiConsole.hpp b/src/dusk/imgui/ImGuiConsole.hpp
index 27032ed39b..2ab61a0ffb 100644
--- a/src/dusk/imgui/ImGuiConsole.hpp
+++ b/src/dusk/imgui/ImGuiConsole.hpp
@@ -14,6 +14,7 @@ namespace dusk {
 class ImGuiConsole {
 public:
     ImGuiConsole();
+    void UpdateSettings();
     void PreDraw();
     void PostDraw();
 
diff --git a/src/dusk/imgui/ImGuiMenuGame.cpp b/src/dusk/imgui/ImGuiMenuGame.cpp
index f200f734d4..1608209bac 100644
--- a/src/dusk/imgui/ImGuiMenuGame.cpp
+++ b/src/dusk/imgui/ImGuiMenuGame.cpp
@@ -78,9 +78,6 @@ namespace dusk {
                 }
                 */
 
-                audio::SetMasterVolume(getSettings().audio.masterVolume / 100.0f);
-                audio::EnableReverb = getSettings().audio.enableReverb;
-
                 ImGui::EndMenu();
             }