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

QmlJSDebugger: Disable Observer pane after debugging ends

Browse Source 
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
This commit is contained in:
Kai Koehne
2010-10-14 13:27:41 +02:00
parent fee3802e15
commit 542796523d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljsinspector/qmljsinspector.cpp
View File

@@ -724,6 +724,8 @@ void InspectorUi::setupToolbar(bool doConnect)
connect(m_clientProxy, SIGNAL(selectedColorChanged(QColor)), m_toolbar, SLOT(setSelectedColor(QColor))); connect(m_clientProxy, SIGNAL(selectedColorChanged(QColor)), m_toolbar, SLOT(setSelectedColor(QColor)));
connect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal))); connect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal)));
enable();
} else { } else {
disconnect(m_clientProxy, SIGNAL(connected()), this, SLOT(enable())); disconnect(m_clientProxy, SIGNAL(connected()), this, SLOT(enable()));
disconnect(m_clientProxy, SIGNAL(disconnected()), this, SLOT(disable())); 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(selectedColorChanged(QColor)), m_toolbar, SLOT(setSelectedColor(QColor)));
disconnect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal))); disconnect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolbar, SLOT(setAnimationSpeed(qreal)));
}
if (m_clientProxy && m_clientProxy->isConnected()) {
enable();
} else {
disable(); disable();
} }
} }