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

QmlCppEngine: Call quitDebugger already in InferiorShutdownRequested

Browse Source 
Doing it in (CppEngine) EngineShutdownOk will result in a write to
an already closed socket.

Change-Id: Ie9712f33d57348ecb27e31eaeb44f42f159a400c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-10 11:51:48 +02:00
parent d0f8fdb29d
commit b8d69b37fc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,6 +684,7 @@ void QmlCppEngine::slaveEngineStateChanged
|| state() == InferiorStopOk, qDebug() << state()); || state() == InferiorStopOk, qDebug() << state());
if (state() == InferiorStopOk) if (state() == InferiorStopOk)
setState(InferiorShutdownRequested); setState(InferiorShutdownRequested);
qmlEngine()->quitDebugger();
break; break;
} }
case InferiorShutdownFailed: { case InferiorShutdownFailed: {
@@ -703,7 +704,6 @@ void QmlCppEngine::slaveEngineStateChanged
case EngineShutdownRequested: { case EngineShutdownRequested: {
// set by queueShutdownEngine() // set by queueShutdownEngine()
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state()); QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
qmlEngine()->quitDebugger();
break; break;
} }
case EngineShutdownFailed: { case EngineShutdownFailed: {
@@ -741,11 +741,12 @@ void QmlCppEngine::slaveEngineStateChanged
} }
QTC_ASSERT(state() == InferiorRunOk QTC_ASSERT(state() == InferiorRunOk
|| state() == InferiorStopRequested, qDebug() << state()); || state() == InferiorStopRequested
|| state() == InferiorShutdownRequested, qDebug() << state());
if (state() == InferiorRunOk) if (state() == InferiorRunOk)
notifyInferiorSpontaneousStop(); notifyInferiorSpontaneousStop();
else else if (state() == InferiorStopRequested)
notifyInferiorStopOk(); notifyInferiorStopOk();
} }