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

debugger: merge 'AdapterStarting' into 'EngineStarting' state

Browse Source
This commit is contained in:
hjk
2010-07-08 11:54:06 +02:00
parent 76e85abf2c
commit 2385e15b2d
14 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/gdb/termgdbadapter.cpp
View File

@@ -82,7 +82,6 @@ AbstractGdbAdapter::DumperHandling TermGdbAdapter::dumperHandling() const
void TermGdbAdapter::startAdapter()
{
QTC_ASSERT(state() == EngineStarting, qDebug() << state());
setState(AdapterStarting);
showMessage(_("TRYING TO START ADAPTER"));
// Currently, adapters are not re-used
@@ -112,7 +111,7 @@ void TermGdbAdapter::startAdapter()
void TermGdbAdapter::handleInferiorStarted()
{
QTC_ASSERT(state() == AdapterStarting, qDebug() << state());
QTC_ASSERT(state() == EngineStarting, qDebug() << state());
emit adapterStarted();
}
@@ -173,7 +172,7 @@ void TermGdbAdapter::stubMessage(const QString &msg, bool)
void TermGdbAdapter::stubExited()
{
showMessage(_("STUB EXITED"));
if (state() != AdapterStarting // From previous instance
if (state() != EngineStarting // From previous instance
&& state() != EngineShuttingDown && state() != DebuggerNotReady)
emit adapterCrashed(QString());
}