From a8098cff93c94960f775f65321e758b53ec78112 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 25 Feb 2010 16:05:45 +0100
Subject: [PATCH] Trk: Do not show additional message box when canceled.
---
src/plugins/debugger/gdb/gdbengine.cpp | 16 +++++++++-------
src/plugins/debugger/gdb/trkgdbadapter.cpp | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index a169b9df4a0..4f186740647 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4075,13 +4075,15 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
{
setState(AdapterStartFailed);
debugMessage(_("ADAPTER START FAILED"));
- const QString title = tr("Adapter start failed");
- if (settingsIdHint.isEmpty()) {
- Core::ICore::instance()->showWarningWithOptions(title, msg);
- } else {
- Core::ICore::instance()->showWarningWithOptions(title, msg, QString(),
- _(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY),
- settingsIdHint);
+ if (!msg.isEmpty()) {
+ const QString title = tr("Adapter start failed");
+ if (settingsIdHint.isEmpty()) {
+ Core::ICore::instance()->showWarningWithOptions(title, msg);
+ } else {
+ Core::ICore::instance()->showWarningWithOptions(title, msg, QString(),
+ _(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY),
+ settingsIdHint);
+ }
}
shutdown();
}
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 54608de8415..063ad2afab3 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -1749,7 +1749,7 @@ bool TrkGdbAdapter::initializeDevice(const QString &remoteChannel, QString *erro
case trk::PromptStartCommunicationConnected:
break;
case trk::PromptStartCommunicationCanceled:
- *errorMessage = tr("Canceled");
+ errorMessage->clear();
return false;
case trk::PromptStartCommunicationError:
return false;
--
GitLab