From 89cd122d14f85ac72b8cd2024b1f8eaa3c1a0e8b Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 24 Oct 2019 05:46:59 +0000
Subject: [PATCH] Initialize sound before music

git-svn-id: https://svn.eduke32.com/eduke32@8255 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/game.cpp    | 2 +-
 source/duke3d/src/menus.cpp   | 2 +-
 source/duke3d/src/osdcmds.cpp | 2 +-
 source/sw/src/setup.cpp       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 7a283d9c2..ed6a2169b 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -6611,8 +6611,8 @@ int app_main(int argc, const char * const*argv)
         }
 
         videoSetPalette(ud.brightness>>2, myplayer.palette, 0);
-        S_MusicStartup();
         S_SoundStartup();
+        S_MusicStartup();
     }
 
     // check if the minifont will support lowercase letters (3136-3161)
diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp
index a4077b0e0..6143011a0 100644
--- a/source/duke3d/src/menus.cpp
+++ b/source/duke3d/src/menus.cpp
@@ -3223,8 +3223,8 @@ static void Menu_EntryLinkActivate(MenuEntry_t *entry)
         S_SoundShutdown();
         S_MusicShutdown();
 
-        S_MusicStartup();
         S_SoundStartup();
+        S_MusicStartup();
 
         FX_StopAllSounds();
         S_ClearSoundLocks();
diff --git a/source/duke3d/src/osdcmds.cpp b/source/duke3d/src/osdcmds.cpp
index 907f3e703..33d857b16 100644
--- a/source/duke3d/src/osdcmds.cpp
+++ b/source/duke3d/src/osdcmds.cpp
@@ -374,8 +374,8 @@ static int osdcmd_restartsound(osdcmdptr_t UNUSED(parm))
     S_SoundShutdown();
     S_MusicShutdown();
 
-    S_MusicStartup();
     S_SoundStartup();
+    S_MusicStartup();
 
     FX_StopAllSounds();
     S_ClearSoundLocks();
diff --git a/source/sw/src/setup.cpp b/source/sw/src/setup.cpp
index 694c2a1e7..b20135af4 100644
--- a/source/sw/src/setup.cpp
+++ b/source/sw/src/setup.cpp
@@ -331,8 +331,8 @@ void main()
     CONTROL_Startup(1, &GetTime, 1500);
     SetupGameButtons();
 
-    MusicStartup();
     SoundStartup();
+    MusicStartup();
     RTS_Init(RTSName);
 
     // load in some test data