Commit 42048fa2 authored by Christiaan Janssen's avatar Christiaan Janssen
Browse files

QmlDebugger: fixed shutdown combined engine

Task-number: QTCREATORBUG-4451

Reviewed-by: Kai Koehne
parent 8aefc980
......@@ -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();
}
......
......@@ -373,13 +373,13 @@ void QmlCppEngine::continueInferior()
void QmlCppEngine::interruptInferior()
{
EDEBUG("\nMASTER INTERRUPT INFERIOR");
d->m_cppEngine->requestInterruptInferior();
}
void QmlCppEngine::requestInterruptInferior()
{
EDEBUG("\nMASTER REQUEST INTERRUPT INFERIOR");
DebuggerEngine::requestInterruptInferior();
d->m_cppEngine->requestInterruptInferior();
}
void QmlCppEngine::executeRunToLine(const ContextData &data)
......@@ -570,6 +570,9 @@ void QmlCppEngine::slaveEngineStateChanged
case InferiorStopOk:
if (isDying()) {
EDEBUG("... AN INFERIOR STOPPED DURING SHUTDOWN ");
if (state() == InferiorStopRequested) {
notifyInferiorStopOk();
}
} else {
if (slaveEngine != d->m_activeEngine) {
QString engineName = slaveEngine == d->m_cppEngine
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment