all repos — mgba @ 08f10b2d73b3a17db1284acdd15e3b9f4ef964c1

mGBA Game Boy Advance Emulator

Qt: Don't unload ROM immediately if it crashes
Vicki Pfau vi@endrift.com
Sat, 12 Jan 2019 16:40:27 -0800
commit

08f10b2d73b3a17db1284acdd15e3b9f4ef964c1

parent

6a5ce56f73d4df6f841324eca08b79c0792f4cc2

3 files changed, 1 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -7,6 +7,7 @@ Misc:

- GBA Savedata: EEPROM performance fixes - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash - GB Memory: Support running from blocked memory + - Qt: Don't unload ROM immediately if it crashes 0.7.0: (Future) Features:
M src/platform/qt/CoreController.cppsrc/platform/qt/CoreController.cpp

@@ -188,7 +188,6 @@ }

message = QString().vsprintf(format, args); QMetaObject::invokeMethod(controller, "logPosted", Q_ARG(int, level), Q_ARG(int, category), Q_ARG(const QString&, message)); if (level == mLOG_FATAL) { - mCoreThreadMarkCrashed(controller->thread()); QMetaObject::invokeMethod(controller, "crashed", Q_ARG(const QString&, QString().vsprintf(format, args))); } };
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -802,7 +802,6 @@ tr("The game has crashed with the following error:\n\n%1").arg(errorMessage),

QMessageBox::Ok, this, Qt::Sheet); crash->setAttribute(Qt::WA_DeleteOnClose); crash->show(); - m_controller->stop(); } void Window::gameFailed() {