From b54fd2f054cedce88efc9e050b2296ade10846c9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 5 Sep 2020 00:07:06 +0200 Subject: [PATCH] - fixed: Entering the menu from SW's intro may not stop the sound. This is a singular special case, everything else must do it. Fixes #335 --- source/sw/src/game.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index d4adff654..887b65227 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -676,7 +676,12 @@ void GameInterface::Startup() } else { - if (!userConfig.nologo) Logo([](bool) { gameaction = ga_mainmenu; }); + if (!userConfig.nologo) Logo([](bool) + { + gamestate = GS_MENUSCREEN; + M_StartControlPanel(false); + M_SetMenu(NAME_Mainmenu); + }); else gameaction = ga_mainmenu; } }