Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Addressed Bunnei's review comments, and made some other tweaks:

Browse source 
- 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.
This commit is contained in:
TheKoopaKingdom 2017-06-02 17:03:38 -04:00
parent ff04320c97
commit f008b22e3b
7 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/citra_qt/main.cpp
View file

@ -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);
}
}
}