ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8877 from JosJuice/convert-fail-message 

DolphinQt: Make conversion error messages actually show up
This commit is contained in:
Tilka 2020-06-16 09:59:03 +01:00 committed by GitHub
parent 26789163e2 20a3119d7a
commit d4418a2b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/ConvertDialog.cpp
View File

@ -12,7 +12,6 @@
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QErrorMessage>
#include <QFileDialog> #include <QFileDialog>
#include <QGridLayout> #include <QGridLayout>
#include <QGroupBox> #include <QGroupBox>
@ -329,8 +328,10 @@ void ConvertDialog::Convert()
if (!blob_reader) if (!blob_reader)
{ {
QErrorMessage(this).showMessage( ModalMessageBox::critical(
this, tr("Error"),
tr("Failed to open the input file \"%1\".").arg(QString::fromStdString(original_path))); tr("Failed to open the input file \"%1\".").arg(QString::fromStdString(original_path)));
return;
} }
else else
{ {
@ -361,7 +362,8 @@ void ConvertDialog::Convert()
progress_dialog.GetRaw()->exec(); progress_dialog.GetRaw()->exec();
if (!good.get()) if (!good.get())
{ {
QErrorMessage(this).showMessage(tr("Dolphin failed to complete the requested action.")); ModalMessageBox::critical(this, tr("Error"),
tr("Dolphin failed to complete the requested action."));
return; return;
} }
} }