forked from qt-creator/qt-creator
QmlJSInspector: Fix disconnect() warnings on users app shutdown
Don't try to disconnect from the proxy if you haven't been connected before, e.g. because the QmlJSObserverService is missing. Reviewed-by: Christiaan Janssen
This commit is contained in:
@@ -261,6 +261,11 @@ void InspectorUi::debugQueryUpdated(QDeclarativeDebugQuery::State newState)
|
||||
disconnect(m_debugQuery,SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),this,SLOT(debugQueryUpdated(QDeclarativeDebugQuery::State)));
|
||||
}
|
||||
|
||||
bool InspectorUi::isConnected() const
|
||||
{
|
||||
return m_clientProxy;
|
||||
}
|
||||
|
||||
void InspectorUi::connected(ClientProxy *clientProxy)
|
||||
{
|
||||
m_clientProxy = clientProxy;
|
||||
|
||||
@@ -103,6 +103,7 @@ public:
|
||||
bool isShadowBuildProject() const;
|
||||
|
||||
void setupUi();
|
||||
bool isConnected() const;
|
||||
void connected(ClientProxy *clientProxy);
|
||||
void disconnected();
|
||||
void setDebuggerEngine(Debugger::QmlEngine *qmlEngine);
|
||||
|
||||
@@ -140,7 +140,8 @@ void InspectorPlugin::objectAdded(QObject *object)
|
||||
void InspectorPlugin::aboutToRemoveObject(QObject *obj)
|
||||
{
|
||||
if (m_clientProxy && m_clientProxy->qmlAdapter() == obj) {
|
||||
m_inspectorUi->disconnected();
|
||||
if (m_inspectorUi->isConnected())
|
||||
m_inspectorUi->disconnected();
|
||||
delete m_clientProxy;
|
||||
m_clientProxy = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user