summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorTheKoopaKingdom <thekoopakingdom@gmail.com>2017-06-02 23:03:38 +0200
committerTheKoopaKingdom <thekoopakingdom@gmail.com>2017-06-03 00:40:39 +0200
commitf008b22e3b2baa7720ea65c320fe49929a53bad7 (patch)
tree24a15888dd6ebc515a09eaf00623fa23e2d4665d /src/citra_qt
parentFixed wiki URLs. (diff)
downloadyuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.gz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.bz2
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.lz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.xz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.zst
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/main.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index c899e075f..4f5b2ddab 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -663,10 +663,11 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
switch (result) {
case Core::System::ResultStatus::ErrorSystemFiles: {
QString message = "Citra was unable to locate a 3DS system archive";
- if (details != std::string())
+ if (!details.empty()) {
message.append(tr(": %1. ").arg(details.c_str()));
- else
+ } else {
message.append(". ");
+ }
message.append(common_message);
answer = QMessageBox::question(this, tr("System Archive Not Found"), message,
@@ -698,11 +699,15 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
}
if (answer == QMessageBox::Yes) {
- if (emu_thread != nullptr)
+ if (emu_thread) {
ShutdownGame();
+ }
} else {
- message_label->setText(status_message);
- message_label->setVisible(true);
+ // Only show the message if the game is still running.
+ if (emu_thread) {
+ message_label->setText(status_message);
+ message_label->setVisible(true);
+ }
}
}