From f788b7c9fdab9b034b828368e57aa60d370cae91 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 7 Nov 2013 09:53:49 +0100
Subject: [PATCH] Silence message box occurring after canceling custom
executable dialog.
(See also fe2dd584fc5ce998e50aa667044505193256f45f ).
Change-Id: Iffb8f95084955a9ca1cc4b7b0adb558f41811cb4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/projectexplorer/projectexplorer.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 5176adde1d2..ecc04bffacd 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1677,12 +1677,10 @@ void ProjectExplorerPlugin::executeRunConfiguration(RunConfiguration *runConfigu
void ProjectExplorerPlugin::showRunErrorMessage(const QString &errorMessage)
{
- if (errorMessage.isNull()) {
- // a error occured, but message was not set
- QMessageBox::critical(ICore::mainWindow(), tr("Unknown error"), errorMessage);
- } else {
- QMessageBox::critical(ICore::mainWindow(), tr("Could Not Run"), errorMessage);
- }
+ // Empty, non-null means 'canceled' (custom executable dialog for libraries), whereas
+ // empty, null means an error occurred, but message was not set
+ if (!errorMessage.isEmpty() || errorMessage.isNull())
+ QMessageBox::critical(ICore::mainWindow(), errorMessage.isNull() ? tr("Unknown error") : tr("Could Not Run"), errorMessage);
}
void ProjectExplorerPlugin::startRunControl(RunControl *runControl, RunMode runMode)
--
GitLab