piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-30 19:09:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:melonDS-emu/melonDS

Browse Source
This commit is contained in:
Arisotura
2023-12-26 19:04:31 +01:00
parent 7f437d48db d55a384c88
commit fd1e4379b9
12 changed files with 166 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/qt_sdl/main.cpp
View File

@ -326,10 +326,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();