diff options
| author | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-04-13 01:18:54 -0400 |
|---|---|---|
| committer | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-06-02 18:28:14 -0400 |
| commit | a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7 (patch) | |
| tree | 37a7edc6a27eff75c96117203f48c9f1ec640b97 /src/citra_qt/main.cpp | |
| parent | 0409bdfea5ea046e3d040ab494b8a0764fd35424 (diff) | |
Created a whitelist of system archives to prevent false positives creating dialogs.
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 1688e55cda..e3b2961883 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -553,10 +553,9 @@ void GMainWindow::OnMenuRecentFile() { void GMainWindow::OnStartGame() { emu_thread->SetRunning(true); qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus"); - qRegisterMetaType<boost::optional<std::string>>("boost::optional<std::string>"); - connect(emu_thread.get(), - SIGNAL(ErrorThrown(Core::System::ResultStatus, boost::optional<std::string>)), this, - SLOT(OnCoreError(Core::System::ResultStatus, boost::optional<std::string>))); + qRegisterMetaType<std::string>("std::string"); + connect(emu_thread.get(), SIGNAL(ErrorThrown(Core::System::ResultStatus, std::string)), this, + SLOT(OnCoreError(Core::System::ResultStatus, std::string))); ui.action_Start->setEnabled(false); ui.action_Start->setText(tr("Continue")); @@ -649,8 +648,7 @@ void GMainWindow::UpdateStatusBar() { emu_frametime_label->setVisible(true); } -void GMainWindow::OnCoreError(Core::System::ResultStatus result, - boost::optional<std::string> details) { +void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) { QMessageBox::StandardButton answer; QString status_message; const QString common_message = @@ -664,8 +662,8 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, switch (result) { case Core::System::ResultStatus::ErrorSystemFiles: { QString message = "Citra was unable to locate a 3DS system archive"; - if (details) - message.append(tr(": %1. ").arg(details.get().c_str())); + if (details != std::string()) + message.append(tr(": %1. ").arg(details.c_str())); else message.append(". "); message.append(common_message); @@ -693,7 +691,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, "<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How to " "Upload the Log File</a>.<br/><br/>Would you like to quit back to the game list?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); - status_message = "Fatal Error encountered."; + status_message = "Fatal Error encountered"; break; } |