From bbe6c8890c420e644a531839f31801c69d9d7412 Mon Sep 17 00:00:00 2001
From: Senjosei <zaaa.warudooo@gmail.com>
Date: Fri, 29 Dec 2017 06:15:59 +1100
Subject: [PATCH 1/3] Pause emulation OnCoreError

---
 src/citra_qt/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index e7c327540..ed334b428 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -918,6 +918,7 @@ void GMainWindow::UpdateStatusBar() {
 }
 
 void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
+    emu_thread->SetRunning(false);
     QMessageBox::StandardButton answer;
     QString status_message;
     const QString common_message =
@@ -974,6 +975,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);
         }

From f17600db1a94269f012cf39b81ef072916839483 Mon Sep 17 00:00:00 2001
From: Senjosei <zaaa.warudooo@gmail.com>
Date: Fri, 29 Dec 2017 06:17:21 +1100
Subject: [PATCH 2/3] Moved when to pause because it wasnt fast enough

---
 src/citra_qt/bootmanager.cpp | 1 +
 src/citra_qt/main.cpp        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 64c0aa541..510d6587a 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -36,6 +36,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/citra_qt/main.cpp b/src/citra_qt/main.cpp
index ed334b428..e66b00903 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -918,7 +918,6 @@ void GMainWindow::UpdateStatusBar() {
 }
 
 void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
-    emu_thread->SetRunning(false);
     QMessageBox::StandardButton answer;
     QString status_message;
     const QString common_message =

From fb72a9d9fa73bcd0f8c2aa57b00b7e4b2961f121 Mon Sep 17 00:00:00 2001
From: Senjosei <zaaa.warudooo@gmail.com>
Date: Fri, 29 Dec 2017 06:31:18 +1100
Subject: [PATCH 3/3] Fixed clang whitespace

---
 src/citra_qt/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index e66b00903..1067c5064 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -974,7 +974,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);            
+            emu_thread->SetRunning(true);
             message_label->setText(status_message);
             message_label->setVisible(true);
         }