From 777df08a8a9045f6050e897e3383c0d0f4de7abb Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Fri, 28 Jul 2023 15:06:45 +0700
Subject: [PATCH] all sounds are stopped before Z_FreeTags even with MUSINFO
 (#1160)

---
 src/p_setup.c | 6 ------
 src/s_sound.c | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index ebad8536..c9a86973 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1552,14 +1552,8 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
     playback_nextlevel = false;
   }
 
-  // [crispy] don't load map's default music if loaded from a savegame with
-  // MUSINFO data
-  if (!musinfo.from_savegame)
-  {
   // Make sure all sounds are stopped before Z_FreeTags.
   S_Start();
-  }
-  musinfo.from_savegame = false;
 
   Z_FreeTag(PU_LEVEL);
   Z_FreeTag(PU_CACHE);
diff --git a/src/s_sound.c b/src/s_sound.c
index 9ae6d778..a1fe8885 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -643,6 +643,14 @@ void S_Start(void)
       }
    }
 
+   // [crispy] don't load map's default music if loaded from a savegame with
+   // MUSINFO data
+   if (musinfo.from_savegame)
+   {
+       musinfo.from_savegame = false;
+       return;
+   }
+
    // start new music for the level
    mus_paused = 0;