From 542796523d4ab0ad5ee8e12ea024de99369f03b6 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 14 Oct 2010 13:27:41 +0200 Subject: [PATCH] QmlJSDebugger: Disable Observer pane after debugging ends At the time setupToolbar is called in the shutdown process the connection still exists. Instead just use the parameter. Task-number: QTCREATORBUG-2693 Reviewed-by: Christiaan Janssen --- src/plugins/qmljsinspector/qmljsinspector.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index 47a4783bd8..7d00423d97 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -724,6 +724,8 @@ void InspectorUi::setupToolbar(bool doConnect) connect(m_clientProxy, SIGNAL(selectedColorChanged(QColor)), m_toolbar, SLOT(setSelectedColor(QColor))); connect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal))); + + enable(); } else { disconnect(m_clientProxy, SIGNAL(connected()), this, SLOT(enable())); disconnect(m_clientProxy, SIGNAL(disconnected()), this, SLOT(disable())); @@ -744,11 +746,7 @@ void InspectorUi::setupToolbar(bool doConnect) disconnect(m_clientProxy, SIGNAL(selectedColorChanged(QColor)), m_toolbar, SLOT(setSelectedColor(QColor))); disconnect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal))); - } - if (m_clientProxy && m_clientProxy->isConnected()) { - enable(); - } else { disable(); } } -- 2.11.0