From 8b097aa17e598fa1d1075ea1e7512925ec423524 Mon Sep 17 00:00:00 2001
From: N00byKing <N00byKing@users.noreply.github.com>
Date: Tue, 16 Jan 2018 17:32:27 +0100
Subject: [PATCH] Implement Pull #3333 from citra: citra_qt: Pause emulation on
 CoreError (#39)

---
 src/yuzu/bootmanager.cpp | 1 +
 src/yuzu/main.cpp        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index a1e0cf575b..843ac6ad7a 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -40,6 +40,7 @@ void EmuThread::run() {
 
             Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
             if (result != Core::System::ResultStatus::Success) {
+                this->SetRunning(false);
                 emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails());
             }
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 51d7f94188..7c711158a0 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -726,6 +726,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
     } else {
         // Only show the message if the game is still running.
         if (emu_thread) {
+            emu_thread->SetRunning(true);
             message_label->setText(status_message);
             message_label->setVisible(true);
         }