piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-02 12:00:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

start moving ROM/firmware loading to the emuthread to avoid cursed bugs

Browse Source
This commit is contained in:
Arisotura
2024-10-24 00:27:05 +02:00
parent 1428bfb2cf
commit 82f38f0b7a
3 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1211,24 +1211,15 @@ void MainWindow::updateCartInserted(bool gba)
void MainWindow::onOpenFile()
{
emuThread->emuPause();
if (!verifySetup())
{
emuThread->emuUnpause();
return;
}
QStringList file = pickROM(false);
if (file.isEmpty())
{
emuThread->emuUnpause();
return;
}
if (!emuInstance->loadROM(file, true))
if (!emuThread->bootROM(file))
{
emuThread->emuUnpause();
return;
}
@ -1237,10 +1228,6 @@ void MainWindow::onOpenFile()
recentFileList.prepend(filename);
updateRecentFilesMenu();
assert(emuInstance->nds != nullptr);
emuInstance->nds->Start();
emuThread->emuRun();
updateCartInserted(false);
}
@ -1310,24 +1297,15 @@ void MainWindow::onClickRecentFile()
QAction *act = (QAction *)sender();
QString filename = act->data().toString();
emuThread->emuPause();
if (!verifySetup())
{
emuThread->emuUnpause();
return;
}
const QStringList file = splitArchivePath(filename, true);
if (file.isEmpty())
{
emuThread->emuUnpause();
return;
}
if (!emuInstance->loadROM(file, true))
if (!emuThread->bootROM(file))
{
emuThread->emuUnpause();
return;
}
@ -1335,34 +1313,19 @@ void MainWindow::onClickRecentFile()
recentFileList.prepend(filename);
updateRecentFilesMenu();
assert(emuInstance->nds != nullptr);
emuInstance->nds->Start();
emuThread->emuRun();
updateCartInserted(false);
}
void MainWindow::onBootFirmware()
{
emuThread->emuPause();
if (!verifySetup())
{
emuThread->emuUnpause();
return;
}
if (!emuInstance->bootToMenu())
if (!emuThread->bootFirmware())
{
// TODO: better error reporting?
QMessageBox::critical(this, "melonDS", "This firmware is not bootable.");
emuThread->emuUnpause();
return;
}
assert(emuInstance->nds != nullptr);
emuInstance->nds->Start();
emuThread->emuRun();
}
void MainWindow::onInsertCart()