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

DebuggerEngine: fixed race condition at qml engine startup

Browse Source 
Reviewed by: hjk
This commit is contained in:
Christiaan Janssen
2010-10-08 15:51:15 +02:00
parent 63f2b87eac
commit 3938cd671b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -260,9 +260,13 @@ void QmlEngine::shutdownInferiorAsSlave()
if (state() == InferiorRunOk) { if (state() == InferiorRunOk) {
setState(InferiorStopRequested); setState(InferiorStopRequested);
setState(InferiorStopOk); setState(InferiorStopOk);
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
} else {
// force
setState(InferiorShutdownRequested, true);
setState(InferiorShutdownOk);
} }
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
} }
void QmlEngine::shutdownEngineAsSlave() void QmlEngine::shutdownEngineAsSlave()