From f2611680ca3ce3c6c90b11a11162c117a260ab58 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Tue, 2 Jul 2024 06:23:21 +0200 Subject: [PATCH] EmuInstance: check consoleType from NDS rather than the instance's when updating console, fixes crash on console type switch EmuInstance::consoleType is already updated, so the check for whether we should recreate the NDS to switch console type never succeeds. --- src/frontend/qt_sdl/EmuInstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp index 73bba4d8..b3711c39 100644 --- a/src/frontend/qt_sdl/EmuInstance.cpp +++ b/src/frontend/qt_sdl/EmuInstance.cpp @@ -1172,7 +1172,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB } - if ((!nds) || (consoletype != consoleType)) + if ((!nds) || (consoletype != nds->ConsoleType)) { NDS::Current = nullptr; if (nds) delete nds;