BlackBerry: Fix for setting a new sensor device file

When a new sensor device file is set, the old one has to be closed
properly and the new one has to be initialized appropriately.

Change-Id: Ie0b1b7a9e21ee349c9c2873c9ba45e0432ccdea5
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/plugins/sensors/blackberry/bbsensorbackend.cpp b/plugins/sensors/blackberry/bbsensorbackend.cpp
index 3b6b581096..4bace8a808 100644
--- a/plugins/sensors/blackberry/bbsensorbackend.cpp
+++ b/plugins/sensors/blackberry/bbsensorbackend.cpp
@@ -113,15 +113,17 @@ sensor_type_e BbSensorBackendBase::sensorType() const
 
 void BbSensorBackendBase::setDevice(const QString &deviceFile, sensor_type_e sensorType)
 {
-    const bool isActive = m_deviceFile.isOpen();
-    if (isActive)
-        stop();
-
-    m_sensorType = sensorType;
-    m_deviceFile.setFileName(deviceFile);
-
-    if (isActive)
-        start();
+    if (deviceFile != m_deviceFile.fileName()) {
+        setPaused(true);
+        delete m_socketNotifier.take();
+        m_deviceFile.close();
+
+        m_sensorType = sensorType;
+        m_deviceFile.setFileName(deviceFile);
+        initSensorInfo();
+        if (m_started)
+            start();    // restart with new device file
+    }
 }
 
 void BbSensorBackendBase::initSensorInfo()