From 1e1ab58ee258da1d664d71494f64424a6a115b97 Mon Sep 17 00:00:00 2001 From: Boondorl Date: Fri, 4 Jul 2025 01:07:18 -0400 Subject: [PATCH] Fixed startup music being cancelled This seems to happen from one of the music cvar callbacks wiping it, but I'm ensure of which (possibly music volume?). Move it to after cvar initializing until a proper fix can be found. --- src/d_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index fe3812ddd..52d3746b5 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -3237,8 +3237,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector& allw else if (gameinfo.gametype == GAME_Strife) GameStartupInfo.Type = FStartupInfo::StrifeStartup; } - - StartScreen = nostartscreen? nullptr : GetGameStartScreen(per_shader_progress > 0 ? max_progress * 10 / 9 : max_progress + 3); GameConfig->DoKeySetup(gameinfo.ConfigName.GetChars()); @@ -3281,7 +3279,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector& allw if (!restart) { screen->CompileNextShader(); - if (StartScreen != nullptr) StartScreen->Render(); } else { @@ -3291,6 +3288,9 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector& allw // Base systems have been inited; enable cvar callbacks FBaseCVar::EnableCallbacks (); + + StartScreen = nostartscreen? nullptr : GetGameStartScreen(per_shader_progress > 0 ? max_progress * 10 / 9 : max_progress + 3); + if (StartScreen != nullptr) StartScreen->Render(); // +compatmode cannot be used on the command line, so use this as a substitute auto compatmodeval = Args->CheckValue("-compatmode");