From 9ccd03ba0122f7d394521222553bbf3e19b944dd Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Tue, 8 Feb 2011 16:17:13 +0100
Subject: [PATCH] QmlDebugger: reseting internal state on engine setup

reviewed-by: Friedemann Kleint
---
 src/plugins/debugger/qml/qmlcppengine.cpp | 2 ++
 src/plugins/debugger/qml/qmlengine.cpp    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 225e4afe800..6326366f10e 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -375,6 +375,8 @@ void QmlCppEngine::executeDebuggerCommand(const QString &command)
 void QmlCppEngine::setupEngine()
 {
     EDEBUG("\nMASTER SETUP ENGINE");
+    d->m_activeEngine = d->m_cppEngine;
+    d->m_stackBoundary = 0;
     d->m_qmlEngine->setupSlaveEngine();
     d->m_cppEngine->setupSlaveEngine();
 }
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 509e9bd184e..47885d3ba2e 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -346,6 +346,7 @@ void QmlEngine::shutdownEngine()
 
 void QmlEngine::setupEngine()
 {
+    d->m_ping = 0;
     d->m_adapter.setMaxConnectionAttempts(MaxConnectionAttempts);
     d->m_adapter.setConnectionAttemptInterval(ConnectionAttemptDefaultInterval);
     connect(&d->m_adapter, SIGNAL(connectionError(QAbstractSocket::SocketError)),