From 2b25e1d6b9360c8ac5e68284f4628a54584f2ac2 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 16 Jun 2020 10:35:00 +0200
Subject: [PATCH 1/2] DolphinQt: Don't show success message when converting
 missing file

---
 Source/Core/DolphinQt/ConvertDialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp
index 44f41e757e..3e98c813f0 100644
--- a/Source/Core/DolphinQt/ConvertDialog.cpp
+++ b/Source/Core/DolphinQt/ConvertDialog.cpp
@@ -331,6 +331,7 @@ void ConvertDialog::Convert()
     {
       QErrorMessage(this).showMessage(
           tr("Failed to open the input file \"%1\".").arg(QString::fromStdString(original_path)));
+      return;
     }
     else
     {

From 20a3119d7a29c5014f6f0d681eda6a8b6dc31f04 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 16 Jun 2020 10:39:40 +0200
Subject: [PATCH 2/2] DolphinQt: Make conversion error messages actually show
 up

I don't know why QErrorMessage doesn't work, but ModalMessageBox
works, so let's use ModalMessageBox.
---
 Source/Core/DolphinQt/ConvertDialog.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp
index 3e98c813f0..aa0a519c26 100644
--- 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,7 +328,8 @@ 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;
     }
@@ -362,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;
       }
     }