From 08f10b2d73b3a17db1284acdd15e3b9f4ef964c1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 12 Jan 2019 16:40:27 -0800
Subject: [PATCH] Qt: Don't unload ROM immediately if it crashes

---
 CHANGES                            | 1 +
 src/platform/qt/CoreController.cpp | 1 -
 src/platform/qt/Window.cpp         | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

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() {