From 36ee6ef345999cef84294c97dfc0de9b26cdf83f Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Sat, 15 Jun 2024 12:21:03 +0200
Subject: [PATCH] fix DSi loading crash

I hate every aspect of this code

also fix potential crash when changing console type
---
 src/frontend/qt_sdl/EmuInstance.cpp | 35 ++++++++++++++---------------
 src/frontend/qt_sdl/Window.cpp      |  4 ++--
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp
index 62097f6d..7585c585 100644
--- a/src/frontend/qt_sdl/EmuInstance.cpp
+++ b/src/frontend/qt_sdl/EmuInstance.cpp
@@ -1123,6 +1123,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
             static_cast<AudioInterpolation>(globalCfg.GetInt("Audio.Interpolation")),
             gdbargs,
     };
+    NDSArgs* args = &ndsargs;
 
     std::optional<DSiArgs> dsiargs = std::nullopt;
     if (consoletype == 1)
@@ -1143,10 +1144,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
 
         auto sdcard = loadSDCard("DSi.SD");
 
-        // FIXME!!! this operation fucking OBLITERATES THE DS BIOS
-        // yes, it somehow makes the std::array null.
-        // so in the end if you start in DSi mode... crash.
-        DSiArgs args {
+        DSiArgs _dsiargs {
                 std::move(ndsargs),
                 std::move(arm9ibios),
                 std::move(arm7ibios),
@@ -1155,7 +1153,8 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
                 globalCfg.GetBool("DSi.FullBIOSBoot"),
         };
 
-        dsiargs = std::move(args);
+        dsiargs = std::move(_dsiargs);
+        args = &(*dsiargs);
     }
 
 
@@ -1174,25 +1173,25 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
     }
     else
     {
-        nds->SetARM7BIOS(*ndsargs.ARM7BIOS);
-        nds->SetARM9BIOS(*ndsargs.ARM9BIOS);
-        nds->SetFirmware(std::move(ndsargs.Firmware));
-        nds->SetNDSCart(std::move(ndsargs.NDSROM));
-        nds->SetJITArgs(ndsargs.JIT);
+        nds->SetARM7BIOS(*args->ARM7BIOS);
+        nds->SetARM9BIOS(*args->ARM9BIOS);
+        nds->SetFirmware(std::move(args->Firmware));
+        nds->SetNDSCart(std::move(args->NDSROM));
+        nds->SetJITArgs(args->JIT);
         // TODO GDB stub shit
-        nds->SPU.SetInterpolation(ndsargs.Interpolation);
-        nds->SPU.SetDegrade10Bit(ndsargs.BitDepth);
+        nds->SPU.SetInterpolation(args->Interpolation);
+        nds->SPU.SetDegrade10Bit(args->BitDepth);
 
         if (consoletype == 1)
         {
             DSi* dsi = (DSi*)nds;
-            DSiArgs& args = dsiargs.value();
+            DSiArgs& _dsiargs = *dsiargs;
 
-            dsi->SetFullBIOSBoot(args.FullBIOSBoot);
-            dsi->ARM7iBIOS = *args.ARM7iBIOS;
-            dsi->ARM9iBIOS = *args.ARM9iBIOS;
-            dsi->SetNAND(std::move(args.NANDImage));
-            dsi->SetSDCard(std::move(args.DSiSDCard));
+            dsi->SetFullBIOSBoot(_dsiargs.FullBIOSBoot);
+            dsi->ARM7iBIOS = *_dsiargs.ARM7iBIOS;
+            dsi->ARM9iBIOS = *_dsiargs.ARM9iBIOS;
+            dsi->SetNAND(std::move(_dsiargs.NANDImage));
+            dsi->SetSDCard(std::move(_dsiargs.DSiSDCard));
             // We're moving the optional, not the card
             // (inserting std::nullopt here is okay, it means no card)
 
diff --git a/src/frontend/qt_sdl/Window.cpp b/src/frontend/qt_sdl/Window.cpp
index fc4e0bb6..cf0c8a55 100644
--- a/src/frontend/qt_sdl/Window.cpp
+++ b/src/frontend/qt_sdl/Window.cpp
@@ -1683,8 +1683,6 @@ void MainWindow::onOpenEmuSettings()
 
 void MainWindow::onEmuSettingsDialogFinished(int res)
 {
-    emuThread->emuUnpause();
-
     if (globalCfg.GetInt("Emu.ConsoleType") == 1)
     {
         actInsertGBACart->setEnabled(false);
@@ -1707,6 +1705,8 @@ void MainWindow::onEmuSettingsDialogFinished(int res)
 
     if (!emuThread->emuIsActive())
         actTitleManager->setEnabled(!globalCfg.GetString("DSi.NANDPath").empty());
+
+    emuThread->emuUnpause();
 }
 
 void MainWindow::onOpenInputConfig()