From 63666f9f8b932c5a1b22754f29ac08b84e161832 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 19 Jan 2011 19:28:16 +0100 Subject: [PATCH] debugger: fix the handling of two stopped slaves --- src/plugins/debugger/qml/qmlcppengine.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 972ea194de3..7751cd1afcb 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -518,6 +518,8 @@ void QmlCppEngine::slaveEngineStateChanged if (otherEngine->state() == InferiorRunOk) { EDEBUG("PLANNED INFERIOR RUN"); notifyInferiorRunOk(); + } else if (otherEngine->state() == InferiorStopOk) { + EDEBUG("PLANNED SINGLE INFERIOR RUN"); } else { EDEBUG(" **** INFERIOR RUN NOT OK ****"); } @@ -542,13 +544,15 @@ void QmlCppEngine::slaveEngineStateChanged showStatusMessage(tr("%1 debugger activated").arg(engineName)); d->m_activeEngine = slaveEngine; } - if (otherEngine->state() == InferiorShutdownOk) { + if (otherEngine->state() == InferiorStopOk) { + EDEBUG("... BOTH STOPPED "); + } else if (otherEngine->state() == InferiorShutdownOk) { EDEBUG("... STOPP "); } else if (state() == InferiorStopRequested) { EDEBUG("... AN INFERIOR STOPPED EXPECTEDLY"); notifyInferiorStopOk(); } else { - EDEBUG("... AN INFERIOR STOPPED UNEXPECTEDLY"); + EDEBUG("... AN INFERIOR STOPPED SPONTANEOUSLY"); notifyInferiorSpontaneousStop(); } }