diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index a169b9df4a08320d6f448224d90810e27959ad37..4f18674064742243afa7ef7a919fc3432673ec50 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 54608de841557a0914e1f47cbce3b8354817bc71..063ad2afab3b7cbe8b089b88da0a0a697c1f5f98 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;