Commit 3938cd67 authored by Christiaan Janssen's avatar Christiaan Janssen
Browse files

DebuggerEngine: fixed race condition at qml engine startup

Reviewed by: hjk
parent 63f2b87e
......@@ -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()
......
......@@ -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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment