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

diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index 47a4783..7d00423 100644 (file)
--- 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();
     }
 }