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

DolphinQt: Make conversion error messages actually show up
milanboers · Jun 16, 2020 · d4418a2 · d4418a2
2 parents 2678916 + 20a3119
commit d4418a2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp
@@ -12,7 +12,6 @@
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QErrorMessage>
 #include <QFileDialog>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -329,8 +328,10 @@ void ConvertDialog::Convert()
 
     if (!blob_reader)
     {
-      QErrorMessage(this).showMessage(
+      ModalMessageBox::critical(
+          this, tr("Error"),
           tr("Failed to open the input file \"%1\".").arg(QString::fromStdString(original_path)));
+      return;
     }
     else
     {
@@ -361,7 +362,8 @@ void ConvertDialog::Convert()
       progress_dialog.GetRaw()->exec();
       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;
       }
     }