diff --git a/CHANGES b/CHANGES index 82d01ed78..2dd22ec57 100644 --- a/CHANGES +++ b/CHANGES @@ -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: diff --git a/src/platform/qt/CoreController.cpp b/src/platform/qt/CoreController.cpp index 1c848ab4b..e4f12087b 100644 --- a/src/platform/qt/CoreController.cpp +++ b/src/platform/qt/CoreController.cpp @@ -188,7 +188,6 @@ CoreController::CoreController(mCore* core, QObject* parent) 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))); } }; diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index f876892e0..97f1d285f 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -802,7 +802,6 @@ void Window::gameCrashed(const QString& errorMessage) { QMessageBox::Ok, this, Qt::Sheet); crash->setAttribute(Qt::WA_DeleteOnClose); crash->show(); - m_controller->stop(); } void Window::gameFailed() {