From b6ebc8ed217e2c88ec23e82c19069b28e85afba0 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond@gmail.com" Date: Wed, 31 Oct 2012 12:07:55 +0000 Subject: [PATCH] Remove warning about null object in QObject::disconnect --- devices/mediadevicecache.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devices/mediadevicecache.cpp b/devices/mediadevicecache.cpp index a27cf593d..5b01f2d4e 100644 --- a/devices/mediadevicecache.cpp +++ b/devices/mediadevicecache.cpp @@ -255,8 +255,10 @@ void MediaDeviceCache::slotRemoveDevice(const QString &udi) debug() << "udi is: " << udi; Solid::Device device(udi); if (m_volumes.contains(udi)) { - disconnect(device.as(), SIGNAL(accessibilityChanged(bool, const QString&)), - this, SLOT(slotAccessibilityChanged(bool, const QString&))); + if (device.as()) { + disconnect(device.as(), SIGNAL(accessibilityChanged(bool, const QString&)), + this, SLOT(slotAccessibilityChanged(bool, const QString&))); + } m_volumes.removeAll(udi); // emit deviceRemoved(udi); }