From 1ecb322daa0e2521fe0e179e87889db9aaaf63b0 Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom
Date: Wed, 8 Mar 2017 16:28:30 -0500
Subject: Added system for handling core errors in citra-qt.

---
 src/citra_qt/bootmanager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/citra_qt/bootmanager.cpp')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 06b62f44c..16661767f 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -37,7 +37,11 @@ void EmuThread::run() {
             if (!was_active)
                 emit DebugModeLeft();
 
-            Core::System::GetInstance().RunLoop();
+            Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
+            if (result != Core::System::ResultStatus::Success) {
+                emit ErrorThrown(result);
+                break;
+            }
 
             was_active = running || exec_step;
             if (!was_active && !stop_run)
-- 
cgit v1.2.3


From 37bec598ea28662462dcaab65d5abd6db8372dbc Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom
Date: Wed, 8 Mar 2017 20:21:31 -0500
Subject: Made some changes from review comments: - Made LoadKernelSystemMode
 return a pair consisting of a system mode and a result code (Could use
 review). - Deleted ErrorOpenGL error code in favor of just having
 ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in
 fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some
 other stuff.

---
 src/citra_qt/bootmanager.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/citra_qt/bootmanager.cpp')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 16661767f..0fdf0c600 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -40,7 +40,6 @@ void EmuThread::run() {
             Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
             if (result != Core::System::ResultStatus::Success) {
                 emit ErrorThrown(result);
-                break;
             }
 
             was_active = running || exec_step;
-- 
cgit v1.2.3


From 0409bdfea5ea046e3d040ab494b8a0764fd35424 Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom
Date: Thu, 13 Apr 2017 01:15:23 -0400
Subject: Optimized messages that were repetitive and added ability for core
 errors to specify more details optionally.

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

(limited to 'src/citra_qt/bootmanager.cpp')

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 0fdf0c600..a8a4aed8b 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -39,7 +39,7 @@ void EmuThread::run() {
 
             Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
             if (result != Core::System::ResultStatus::Success) {
-                emit ErrorThrown(result);
+                emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails());
             }
 
             was_active = running || exec_step;
-- 
cgit v1.2.3