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

Debugger: Accept transition from InferiorStopOk to InferiorRunOk

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2018-02-12 15:01:16 +01:00
parent b2909c1648
commit 2132ed8c96
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -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