summaryrefslogtreecommitdiffstats
path: root/src/yuzu/applets/qt_error.cpp
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-03-25 18:29:08 +0100
committerLiam <byteslice@airmail.cc>2023-03-25 19:49:43 +0100
commit50a59487eb49baa229d553dd9a3c00aef20f799f (patch)
tree49ed16c5614ad4772f5183ac7bbbb911ce092c1a /src/yuzu/applets/qt_error.cpp
parentapplets: implement RequestExit (diff)
downloadyuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar.gz
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar.bz2
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar.lz
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar.xz
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.tar.zst
yuzu-50a59487eb49baa229d553dd9a3c00aef20f799f.zip
Diffstat (limited to 'src/yuzu/applets/qt_error.cpp')
-rw-r--r--src/yuzu/applets/qt_error.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/yuzu/applets/qt_error.cpp b/src/yuzu/applets/qt_error.cpp
index e0190a979..1dc4f0383 100644
--- a/src/yuzu/applets/qt_error.cpp
+++ b/src/yuzu/applets/qt_error.cpp
@@ -8,12 +8,19 @@
QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) {
connect(this, &QtErrorDisplay::MainWindowDisplayError, &parent,
&GMainWindow::ErrorDisplayDisplayError, Qt::QueuedConnection);
+ connect(this, &QtErrorDisplay::MainWindowRequestExit, &parent,
+ &GMainWindow::ErrorDisplayRequestExit, Qt::QueuedConnection);
connect(&parent, &GMainWindow::ErrorDisplayFinished, this,
&QtErrorDisplay::MainWindowFinishedError, Qt::DirectConnection);
}
QtErrorDisplay::~QtErrorDisplay() = default;
+void QtErrorDisplay::Close() const {
+ callback = {};
+ emit MainWindowRequestExit();
+}
+
void QtErrorDisplay::ShowError(Result error, FinishedCallback finished) const {
callback = std::move(finished);
emit MainWindowDisplayError(
@@ -55,5 +62,7 @@ void QtErrorDisplay::ShowCustomErrorText(Result error, std::string dialog_text,
}
void QtErrorDisplay::MainWindowFinishedError() {
- callback();
+ if (callback) {
+ callback();
+ }
}