M src/platform/qt/CoreController.cpp → src/platform/qt/CoreController.cpp

@@ -197,6 +197,9 @@ if (m_cacheSet) {
 		mCacheSetDeinit(m_cacheSet.get());
 		m_cacheSet.reset();
 	}
+
+	mCoreConfigDeinit(&m_threadContext.core->config);
+	m_threadContext.core->deinit(m_threadContext.core);
 }
 
 const color_t* CoreController::drawContext() {

M src/platform/qt/Window.cpp → src/platform/qt/Window.cpp

@@ -780,11 +780,6 @@ }
 
 void Window::gameStopped() {
 	m_controller.reset();
-	m_display->stopDrawing();
-	if (m_pendingClose) {
-		m_display.reset();
-		close();
-	}
 #ifdef M_CORE_GBA
 	for (Action* action : m_platformActions) {
 		action->setEnabled(true);
@@ -818,6 +813,11 @@
 	if (m_audioProcessor) {
 		m_audioProcessor->stop();
 		m_audioProcessor.reset();
+	}
+	m_display->stopDrawing();
+	if (m_pendingClose) {
+		m_display.reset();
+		close();
 	}
 
 #ifdef USE_DISCORD_RPC