Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: Iaeb7c9f62b50d68e0cedb95c523aebcceb9128c0

1 files changed, 24 insertions, 8 deletions

diff --git a/src/plugins/sensors/ios/iosmagnetometer.mm b/src/plugins/sensors/ios/iosmagnetometer.mm
index 6bbad60..98bef2d 100644
--- a/src/plugins/sensors/ios/iosmagnetometer.mm
+++ b/src/plugins/sensors/ios/iosmagnetometer.mm
@@ -44,6 +44,9 @@ QT_BEGIN_NAMESPACE
 
 char const * const IOSMagnetometer::id("ios.magnetometer");
 
+int IOSMagnetometer::s_magnetometerStartCount = 0;
+int IOSMagnetometer::s_deviceMotionStartCount = 0;
+
 IOSMagnetometer::IOSMagnetometer(QSensor *sensor)
     : QSensorBackend(sensor)
     , m_motionManager([QIOSMotionManager sharedManager])
@@ -61,24 +64,37 @@ IOSMagnetometer::IOSMagnetometer(QSensor *sensor)
 
 void IOSMagnetometer::start()
 {
+    if (m_timer != 0)
+        return;
+
     int hz = sensor()->dataRate();
     m_timer = startTimer(1000 / (hz == 0 ? 60 : hz));
     m_returnGeoValues = static_cast<QMagnetometer *>(sensor())->returnGeoValues();
 
-    if (m_returnGeoValues)
-        [m_motionManager startDeviceMotionUpdates];
-    else
-        [m_motionManager startMagnetometerUpdates];
+    if (m_returnGeoValues) {
+        if (++s_deviceMotionStartCount == 1)
+            [m_motionManager startDeviceMotionUpdates];
+    } else {
+        if (++s_magnetometerStartCount == 1)
+            [m_motionManager startMagnetometerUpdates];
+    }
 }
 
 void IOSMagnetometer::stop()
 {
-    if (m_returnGeoValues)
-        [m_motionManager stopDeviceMotionUpdates];
-    else
-        [m_motionManager stopMagnetometerUpdates];
+    if (m_timer == 0)
+        return;
+
     killTimer(m_timer);
     m_timer = 0;
+
+    if (m_returnGeoValues) {
+        if (--s_deviceMotionStartCount == 0)
+            [m_motionManager stopDeviceMotionUpdates];
+    } else {
+        if (--s_magnetometerStartCount == 0)
+            [m_motionManager stopMagnetometerUpdates];
+    }
 }
 
 void IOSMagnetometer::timerEvent(QTimerEvent *)