feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Trk: Do not show additional message box when canceled.

Browse Source
This commit is contained in:
Friedemann Kleint
2010-02-25 16:05:45 +01:00
parent 486f40ee25
commit a8098cff93
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4075,6 +4075,7 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
{ {
setState(AdapterStartFailed); setState(AdapterStartFailed);
debugMessage(_("ADAPTER START FAILED")); debugMessage(_("ADAPTER START FAILED"));
if (!msg.isEmpty()) {
const QString title = tr("Adapter start failed"); const QString title = tr("Adapter start failed");
if (settingsIdHint.isEmpty()) { if (settingsIdHint.isEmpty()) {
Core::ICore::instance()->showWarningWithOptions(title, msg); Core::ICore::instance()->showWarningWithOptions(title, msg);
@@ -4083,6 +4084,7 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
_(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY), _(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY),
settingsIdHint); settingsIdHint);
} }
}
shutdown(); shutdown();
} }

2
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1749,7 +1749,7 @@ bool TrkGdbAdapter::initializeDevice(const QString &remoteChannel, QString *erro
case trk::PromptStartCommunicationConnected: case trk::PromptStartCommunicationConnected:
break; break;
case trk::PromptStartCommunicationCanceled: case trk::PromptStartCommunicationCanceled:
*errorMessage = tr("Canceled"); errorMessage->clear();
return false; return false;
case trk::PromptStartCommunicationError: case trk::PromptStartCommunicationError:
return false; return false;