Don't call Reset on nullptr

melonDS-emu · Dec 26, 2023 · 740489f · 740489f
1 parent ac3153d
commit 740489f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
@@ -329,10 +329,14 @@ bool EmuThread::UpdateConsole(UpdateConsoleNDSArgs&& ndsargs, UpdateConsoleGBAAr
         NDS::Current = nullptr;
 
         NDS = CreateConsole(std::move(nextndscart), std::move(nextgbacart));
+
+        if (NDS == nullptr)
+            return false;
+
         NDS->Reset();
         NDS::Current = NDS.get();
 
-        return NDS != nullptr;
+        return true;
     }
 
     auto arm9bios = ROMManager::LoadARM9BIOS();