DebuggerEngine: fixed race condition at qml engine startup

Reviewed by: hjk

DebuggerEngine: fixed race condition at qml engine startup
Reviewed by: hjk
3938cd67 · Christiaan Janssen · 63f2b87e · 3938cd67 · 3938cd67
Commit 3938cd67 authored Oct 08, 2010 by Christiaan Janssen
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

src/plugins/debugger/qml/qmlcppengine.cpp src/plugins/debugger/qml/qmlcppengine.cpp +1 -1

src/plugins/debugger/qml/qmlengine.cpp src/plugins/debugger/qml/qmlengine.cpp +6 -2

No files found.
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -449,7 +449,7 @@ void QmlCppEngine::finishDebugger()

 void QmlCppEngine::setupSlaveEngineOnTimer()
 {
-    QTimer::singleShot(ConnectionWaitTimeMs, this, SLOT(setupSlaveEngine()));
+    QTimer::singleShot(0, this, SLOT(setupSlaveEngine()));
 }

 void QmlCppEngine::setupSlaveEngine()

--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -260,9 +260,13 @@ void QmlEngine::shutdownInferiorAsSlave()
    if (state() == InferiorRunOk) {
        setState(InferiorStopRequested);
        setState(InferiorStopOk);
+        setState(InferiorShutdownRequested);
+        setState(InferiorShutdownOk);
+    } else {
+        // force
+        setState(InferiorShutdownRequested, true);
+        setState(InferiorShutdownOk);
    }
-    setState(InferiorShutdownRequested);
-    setState(InferiorShutdownOk);
 }

 void QmlEngine::shutdownEngineAsSlave()