summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/ConvertDialog.cpp
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2020-06-16 09:59:03 +0100
committerGitHub <noreply@github.com>2020-06-16 09:59:03 +0100
commitd4418a2b431c1d8497b3cf71cfcf844623dd3343 (patch)
tree9569677d6f59163076800b8ce71a8b68547127d7 /Source/Core/DolphinQt/ConvertDialog.cpp
parent26789163e2aafcabdabc70aad76a76ff499603d4 (diff)
parent20a3119d7a29c5014f6f0d681eda6a8b6dc31f04 (diff)
Merge pull request #8877 from JosJuice/convert-fail-message
DolphinQt: Make conversion error messages actually show up
Diffstat (limited to 'Source/Core/DolphinQt/ConvertDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/ConvertDialog.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp
index 44f41e757e..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,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;
}
}