Fix installer UI lingering when booting the game

hyperbx · hyperbx · commit 027fddde40f6 · 2026-02-08T13:56:34.000Z
diff --git a/MarathonRecomp/ui/installer_wizard.cpp b/MarathonRecomp/ui/installer_wizard.cpp
@@ -1379,7 +1379,6 @@ bool InstallerWizard::Run(std::filesystem::path installPath, bool skipGame)
     }
 
     SetCurrentPage(g_firstPage);
-
     GameWindow::SetFullscreenCursorVisibility(true);
 
     s_isVisible = true;
@@ -1394,11 +1393,12 @@ bool InstallerWizard::Run(std::filesystem::path installPath, bool skipGame)
         Video::Present();
     }
 
+    Fader::FadeIn(0);
+    ButtonWindow::Close();
     GameWindow::SetFullscreenCursorVisibility(false);
-
     NFD_Quit();
-    InstallerWizard::Shutdown();
     EmbeddedPlayer::Shutdown();
+    InstallerWizard::Shutdown();
 
     return !g_isQuitting;
 }

Original file line number	Diff line number	Diff line change
`@@ -1379,7 +1379,6 @@ bool InstallerWizard::Run(std::filesystem::path installPath, bool skipGame)`
`1379`	`1379`	`}`
`1380`	`1380`
`1381`	`1381`	`SetCurrentPage(g_firstPage);`
`1382`		`-`
`1383`	`1382`	`GameWindow::SetFullscreenCursorVisibility(true);`
`1384`	`1383`
`1385`	`1384`	`s_isVisible = true;`
`@@ -1394,11 +1393,12 @@ bool InstallerWizard::Run(std::filesystem::path installPath, bool skipGame)`
`1394`	`1393`	`Video::Present();`
`1395`	`1394`	`}`
`1396`	`1395`
	`1396`	`+ Fader::FadeIn(0);`
	`1397`	`+ ButtonWindow::Close();`
`1397`	`1398`	`GameWindow::SetFullscreenCursorVisibility(false);`
`1398`		`-`
`1399`	`1399`	`NFD_Quit();`
`1400`		`- InstallerWizard::Shutdown();`
`1401`	`1400`	`EmbeddedPlayer::Shutdown();`
	`1401`	`+ InstallerWizard::Shutdown();`
`1402`	`1402`
`1403`	`1403`	`return !g_isQuitting;`
`1404`	`1404`	`}`