Merge remote-tracking branch 'origin/9.0'

Change-Id: Idd9c2b1bf787040b7b415b7cda29035227ca1011

1 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index e6d3fd2054..9fee60a9d0 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -1832,11 +1832,13 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
                     QList<Breakpoint> v8Breakpoints;
 
                     const QVariantList v8BreakpointIdList = breakData.value("breakpoints").toList();
-                    // skip debug break if no breakpoint and we have not done a single step as last
-                    // action - likely stopped in another file with same naming
-                    if (v8BreakpointIdList.isEmpty() && previousStepAction == Continue) {
-                        inferiorStop = false;
-                        continueDebugging(Continue);
+                    if (engine->state() != InferiorStopRequested) {
+                        // skip debug break if no breakpoint and we have not done a single step as
+                        // last action - likely stopped in another file with same naming
+                        if (v8BreakpointIdList.isEmpty() && previousStepAction == Continue) {
+                            inferiorStop = false;
+                            continueDebugging(Continue);
+                        }
                     }
 
                     for (const QVariant &breakpointId : v8BreakpointIdList) {