From e6fb0179f31fb834c10c95745c5d53e6770ec652 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 10 May 2012 12:20:13 +0200 Subject: [PATCH] QmlEngine: Stop connection timer if setup fails Change-Id: Ibc2a0a311fb1b1af3fc7a6bf486010b31117475b Reviewed-by: Aurindam Jana --- src/plugins/debugger/qml/qmlengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 2c5b14de308..65447ace2b5 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -640,8 +640,6 @@ void QmlEngine::handleRemoteSetupFailed(const QString &message) void QmlEngine::shutdownInferior() { - m_noDebugOutputTimer.stop(); - if (m_adapter.activeDebuggerClient()) m_adapter.activeDebuggerClient()->endSession(); @@ -656,7 +654,9 @@ void QmlEngine::shutdownInferior() void QmlEngine::shutdownEngine() { - // double check (ill engine?): + m_noDebugOutputTimer.stop(); + + // double check (ill engine?): stopApplicationLauncher(); notifyEngineShutdownOk();