Merge a47d699295 into 80e779afd9

UnleashedRecomp/main.cpp

@@ -337,7 +337,14 @@ int main(int argc, char *argv[])
 
         if (!InstallerWizard::Run(GetGamePath(), isGameInstalled && forceDLCInstaller))
         {
-            std::_Exit(0);
+            if (!forceDLCInstaller)
+            {
+                std::_Exit(0);
+            }
+            else
+            {
+                InstallerWizard::s_returnToTitle = true;
+            }
         }
     }
 

UnleashedRecomp/patches/misc_patches.cpp

@@ -1,5 +1,6 @@
 #include <api/SWA.h>
 #include <ui/game_window.h>
+#include <ui/installer_wizard.h>
 #include <user/achievement_manager.h>
 #include <user/persistent_storage_manager.h>
 #include <user/config.h>
@@ -83,7 +84,7 @@ PPC_FUNC(sub_825197C0)
 PPC_FUNC_IMPL(__imp__sub_82547DF0);
 PPC_FUNC(sub_82547DF0)
 {
-    if (Config::SkipIntroLogos)
+    if (Config::SkipIntroLogos || InstallerWizard::s_returnToTitle)
     {
         ctx.r4.u64 = 0;
         ctx.r5.u64 = 0;

UnleashedRecomp/ui/installer_wizard.h

@@ -5,6 +5,7 @@
 struct InstallerWizard
 {
     static inline bool s_isVisible = false;
+    static inline bool s_returnToTitle = false;
 
     static void Init();
     static void Draw();