From 2132ed8c96b9a662be34d7ff71e099d7825aecd7 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 12 Feb 2018 15:01:16 +0100 Subject: [PATCH] Debugger: Accept transition from InferiorStopOk to InferiorRunOk This can happen if we continue after an automatic break point at application start. Set the state to InferiorRunRequested first, and then to InferiorRunOk. Change-Id: I0c4094ef0b335f31099cceb49b23aa3bc1a9a7af Task-number: QTCREATORBUG-19712 Reviewed-by: hjk --- src/plugins/debugger/qml/qmlcppengine.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index d90799a42ac..bf3a51e43f5 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -481,12 +481,16 @@ void QmlCppEngine::slaveEngineStateChanged break; } case InferiorRunOk: { - if (state() == EngineRunRequested) + if (state() == EngineRunRequested) { notifyEngineRunAndInferiorRunOk(); - else if (state() == InferiorRunRequested) + } else if (state() == InferiorRunRequested) { notifyInferiorRunOk(); - else + } else if (state() == InferiorStopOk) { + notifyInferiorRunRequested(); + notifyInferiorRunOk(); + } else { QTC_ASSERT(false, qDebug() << state()); + } if (m_qmlEngine->state() == InferiorStopOk) { // track qml engine again