summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlcppengine.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-23 14:17:36 +0200
committerhjk <hjk@qt.io>2018-05-23 15:24:16 +0000
commit8b8237b11b72a4ef470493472083b63e3074b391 (patch)
tree5c241b699f7c1fb5325032e68e0e47d7f13b4cc2 /src/plugins/debugger/qml/qmlcppengine.cpp
parent51f5f25f990aedcacc6770f8f7ef5fbd96fa8690 (diff)
downloadqt-creator-8b8237b11b72a4ef470493472083b63e3074b391.tar.gz
Debugger: Fix combined debugger interrupt state machine
This fixes the case where the mixed engine was used, and called one of the slave engine's interruptInferior() without setting the InterruptStopRequested state in the slave. Change-Id: I45adbdcebc02940d6fcfb4299ef9f4bef1341b32 Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
-rw-r--r--src/plugins/debugger/qml/qmlcppengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index bf3a51e43f..1a920f5f3e 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -337,6 +337,7 @@ void QmlCppEngine::continueInferior()
void QmlCppEngine::interruptInferior()
{
EDEBUG("\nMASTER INTERRUPT INFERIOR");
+ m_activeEngine->setState(InferiorStopRequested);
m_activeEngine->interruptInferior();
}