ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dsfsdhgf

This commit is contained in:
Arisotura 2024-11-19 00:11:46 +01:00
parent d68091ee9c
commit 259eb4b408
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -245,6 +245,8 @@ void EmuInstance::deleteWindow(int id, bool close)
if (close) if (close)
win->close(); win->close();
if (deleting) return;
if (numWindows == 0) if (numWindows == 0)
{ {
// if we closed the last window, delete the instance // if we closed the last window, delete the instance
@ -1456,16 +1458,16 @@ void EmuInstance::reset()
bool EmuInstance::bootToMenu() bool EmuInstance::bootToMenu()
{printf("bootToMenu 1\n"); {
// Keep whatever cart is in the console, if any. // Keep whatever cart is in the console, if any.
if (!updateConsole()) if (!updateConsole())
// Try to update the console, but keep the existing cart. If that fails... // Try to update the console, but keep the existing cart. If that fails...
return false; return false;
printf("bootToMenu 2\n");
// BIOS and firmware files are loaded, patched, and installed in UpdateConsole // BIOS and firmware files are loaded, patched, and installed in UpdateConsole
if (nds->NeedsDirectBoot()) if (nds->NeedsDirectBoot())
return false; return false;
printf("bootToMenu 3\n");
initFirmwareSaveManager(); initFirmwareSaveManager();
nds->Reset(); nds->Reset();
setBatteryLevels(); setBatteryLevels();

2
src/frontend/qt_sdl/Window.cpp
View File

@ -819,6 +819,8 @@ void MainWindow::saveEnabled(bool enabled)
void MainWindow::closeEvent(QCloseEvent* event) void MainWindow::closeEvent(QCloseEvent* event)
{ {
if (!emuInstance) return;
if (windowID == 0) if (windowID == 0)
emuInstance->saveEnabledWindows(); emuInstance->saveEnabledWindows();
else else