diff options
| author | 2017-06-02 17:03:38 -0400 | |
|---|---|---|
| committer | 2017-06-02 18:40:39 -0400 | |
| commit | f008b22e3b2baa7720ea65c320fe49929a53bad7 (patch) | |
| tree | 24a15888dd6ebc515a09eaf00623fa23e2d4665d /src/citra_qt/main.cpp | |
| parent | Fixed wiki URLs. (diff) | |
| download | yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.gz yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.xz yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.zip | |
Addressed Bunnei's review comments, and made some other tweaks:
- Deleted GetStatus() because it wasn't used anywhere outside of Core::System.
- Fixed design flaw where the message bar status could be set despite the game being stopped.
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 15 |
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 | |||
| 663 | switch (result) { | 663 | switch (result) { |
| 664 | case Core::System::ResultStatus::ErrorSystemFiles: { | 664 | case Core::System::ResultStatus::ErrorSystemFiles: { |
| 665 | QString message = "Citra was unable to locate a 3DS system archive"; | 665 | QString message = "Citra was unable to locate a 3DS system archive"; |
| 666 | if (details != std::string()) | 666 | if (!details.empty()) { |
| 667 | message.append(tr(": %1. ").arg(details.c_str())); | 667 | message.append(tr(": %1. ").arg(details.c_str())); |
| 668 | else | 668 | } else { |
| 669 | message.append(". "); | 669 | message.append(". "); |
| 670 | } | ||
| 670 | message.append(common_message); | 671 | message.append(common_message); |
| 671 | 672 | ||
| 672 | answer = QMessageBox::question(this, tr("System Archive Not Found"), message, | 673 | answer = QMessageBox::question(this, tr("System Archive Not Found"), message, |
| @@ -698,11 +699,15 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det | |||
| 698 | } | 699 | } |
| 699 | 700 | ||
| 700 | if (answer == QMessageBox::Yes) { | 701 | if (answer == QMessageBox::Yes) { |
| 701 | if (emu_thread != nullptr) | 702 | if (emu_thread) { |
| 702 | ShutdownGame(); | 703 | ShutdownGame(); |
| 704 | } | ||
| 703 | } else { | 705 | } else { |
| 704 | message_label->setText(status_message); | 706 | // Only show the message if the game is still running. |
| 705 | message_label->setVisible(true); | 707 | if (emu_thread) { |
| 708 | message_label->setText(status_message); | ||
| 709 | message_label->setVisible(true); | ||
| 710 | } | ||
| 706 | } | 711 | } |
| 707 | } | 712 | } |
| 708 | 713 | ||