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

QmlDebugger: fixed shutdown combined engine

Browse Source 
Task-number: QTCREATORBUG-4451

Reviewed-by: Kai Koehne
This commit is contained in:
Christiaan Janssen
2011-04-18 16:49:41 +02:00
parent 8aefc9801d
commit 42048fa2a0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerengine.cpp
View File

@@ -209,8 +209,11 @@ public slots:
QTC_ASSERT(state() == EngineShutdownOk
|| state() == EngineShutdownFailed, qDebug() << state());
m_engine->setState(DebuggerFinished);
m_engine->showMessage(_("QUEUE: FINISH DEBUGGER"));
QTimer::singleShot(0, this, SLOT(doFinishDebugger()));
resetLocation();
if (isMasterEngine()) {
m_engine->showMessage(_("QUEUE: FINISH DEBUGGER"));
QTimer::singleShot(0, this, SLOT(doFinishDebugger()));
}
}
void raiseApplication()
@@ -1011,7 +1014,6 @@ void DebuggerEnginePrivate::doFinishDebugger()
{
m_engine->showMessage(_("NOTE: FINISH DEBUGGER"));
QTC_ASSERT(state() == DebuggerFinished, qDebug() << m_engine << state());
resetLocation();
if (isMasterEngine() && m_runControl)
m_runControl->debuggingFinished();
}