From a1116bd227e6113d95fd2c312f7566560926dfd3 Mon Sep 17 00:00:00 2001 From: craig Date: Sun, 4 Mar 2012 16:33:02 +0000 Subject: [PATCH] Confirm device is valid --- devices/mtpdevice.cpp | 2 +- devices/umsdevice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp index 642e0927d..52901eec2 100644 --- a/devices/mtpdevice.cpp +++ b/devices/mtpdevice.cpp @@ -545,7 +545,7 @@ void MtpDevice::deviceDetails(const QString &s) bool MtpDevice::isConnected() const { - return pmp && connection->isConnected(); + return pmp && pmp->isValid() && connection->isConnected(); } void MtpDevice::configure(QWidget *parent) diff --git a/devices/umsdevice.cpp b/devices/umsdevice.cpp index 6f68457c8..2e53e0db0 100644 --- a/devices/umsdevice.cpp +++ b/devices/umsdevice.cpp @@ -65,7 +65,7 @@ UmsDevice::~UmsDevice() { bool UmsDevice::isConnected() const { - return access && access->isAccessible(); + return access && access->isValid() && access->isAccessible(); } double UmsDevice::usedCapacity()