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

---
 src/citra_qt/main.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/citra_qt/main.h')

diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index cb2e87cbd..1ce0607e2 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -125,6 +125,7 @@ private slots:
     void OnDisplayTitleBars(bool);
     void ToggleWindowMode();
     void OnCreateGraphicsSurfaceViewer();
+    void OnCoreError(Core::System::ResultStatus);
 
 private:
     void UpdateStatusBar();
-- 
cgit v1.2.3


From b6bab59000cbcdb34aed3f8633c5aae391db6dcb Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom <thekoopakingdom@gmail.com>
Date: Thu, 13 Apr 2017 01:10:19 -0400
Subject: Added message to status bar to show core errors ignored by the user.

---
 src/citra_qt/main.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/citra_qt/main.h')

diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 1ce0607e2..3ecbc001e 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -136,6 +136,7 @@ private:
     GameList* game_list;
 
     // Status bar elements
+    QLabel* message_label = nullptr;
     QLabel* emu_speed_label = nullptr;
     QLabel* game_fps_label = nullptr;
     QLabel* emu_frametime_label = nullptr;
-- 
cgit v1.2.3


From 0409bdfea5ea046e3d040ab494b8a0764fd35424 Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom <thekoopakingdom@gmail.com>
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/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/citra_qt/main.h')

diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 3ecbc001e..eb2b055f6 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -125,7 +125,7 @@ private slots:
     void OnDisplayTitleBars(bool);
     void ToggleWindowMode();
     void OnCreateGraphicsSurfaceViewer();
-    void OnCoreError(Core::System::ResultStatus);
+    void OnCoreError(Core::System::ResultStatus, boost::optional<std::string>);
 
 private:
     void UpdateStatusBar();
-- 
cgit v1.2.3


From a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7 Mon Sep 17 00:00:00 2001
From: TheKoopaKingdom <thekoopakingdom@gmail.com>
Date: Thu, 13 Apr 2017 01:18:54 -0400
Subject: Created a whitelist of system archives to prevent false positives
 creating dialogs.

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

(limited to 'src/citra_qt/main.h')

diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index eb2b055f6..952a50974 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <QMainWindow>
 #include <QTimer>
+#include "core/core.h"
 #include "ui_main.h"
 
 class Config;
@@ -125,7 +126,7 @@ private slots:
     void OnDisplayTitleBars(bool);
     void ToggleWindowMode();
     void OnCreateGraphicsSurfaceViewer();
-    void OnCoreError(Core::System::ResultStatus, boost::optional<std::string>);
+    void OnCoreError(Core::System::ResultStatus, std::string);
 
 private:
     void UpdateStatusBar();
-- 
cgit v1.2.3