From 2fb6f0b7685dda7162fe40fa833c6ba3e41c60fa Mon Sep 17 00:00:00 2001
From: walkawayy <81546780+walkawayy@users.noreply.github.com>
Date: Wed, 25 Sep 2024 19:54:13 -0400
Subject: [PATCH] music: fix the main music playing at the wrong volume

Fixed quiet or mute main menu music if a level was exited while
underwater and the quiet, full but no ambient, quiet but no
ambient, or none underwater music behavior option was set.

Resolves #1540.
---
 CHANGELOG.md     | 1 +
 src/game/music.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 933fed886..a5eb482e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - fixed ability to crash the game with extreme FOV values (regression from 0.9)
 - fixed double "Fly mode enabled" message when using `/fly` console command (regression from 4.0)
 - fixed crash in the `/set` console command (regression from 4.4)
+- fixed the main menu music being quiet or mute if a level was exited while underwater and the quiet, full but no ambient, quiet but no ambient, or none underwater music behavior option was set (regression from 4.4)
 
 ## [4.4](https://github.com/LostArtefacts/TR1X/compare/4.3-102-g458cd96...4.4) - 2024-09-20
 - added `/exit` command (#1462)
diff --git a/src/game/music.c b/src/game/music.c
index c24810a58..b0c464c69 100644
--- a/src/game/music.c
+++ b/src/game/music.c
@@ -134,6 +134,8 @@ bool Music_PlayLooped(MUSIC_TRACK_ID track)
     if (g_CurrentLevel == g_GameFlow.title_level_num
         && !g_Config.enable_music_in_menu) {
         return false;
+    } else if (g_CurrentLevel == g_GameFlow.title_level_num) {
+        Music_SetVolume(g_Config.music_volume);
     }
 
     M_StopActiveStream();