diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:17 +0200 |
| commit | ecd018fe2ee4508e094f631d882ecc1360abec01 (patch) | |
| tree | 9b1a8f00e0d6eca0f51768d7af4018f7af0187f8 /src/plugins/sensors/ios/iosproximitysensor.mm | |
| parent | 62ec986855e3b3c9fda54a09ca83ae5039663c9c (diff) | |
| parent | 724008411c16aaf8fa25c09745e20d0d47d65721 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I14345192d06a8a0ac9000feab6daea0f11b41f72
Diffstat (limited to 'src/plugins/sensors/ios/iosproximitysensor.mm')
| -rw-r--r-- | src/plugins/sensors/ios/iosproximitysensor.mm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/sensors/ios/iosproximitysensor.mm b/src/plugins/sensors/ios/iosproximitysensor.mm index 6a2465bf..eae85608 100644 --- a/src/plugins/sensors/ios/iosproximitysensor.mm +++ b/src/plugins/sensors/ios/iosproximitysensor.mm @@ -45,6 +45,8 @@ char const * const IOSProximitySensor::id("ios.proximitysensor"); QT_BEGIN_NAMESPACE +int IOSProximitySensor::s_startCount = 0; + @interface ProximitySensorCallback : NSObject { IOSProximitySensor *m_iosProximitySensor; @@ -110,8 +112,12 @@ IOSProximitySensor::~IOSProximitySensor() void IOSProximitySensor::start() { + if (m_proximitySensorCallback) + return; + m_proximitySensorCallback = [[ProximitySensorCallback alloc] initWithQIOSProximitySensor:this]; - [UIDevice currentDevice].proximityMonitoringEnabled = YES; + if (++s_startCount == 1) + [UIDevice currentDevice].proximityMonitoringEnabled = YES; } void IOSProximitySensor::proximityChanged(bool close) @@ -123,9 +129,13 @@ void IOSProximitySensor::proximityChanged(bool close) void IOSProximitySensor::stop() { - [UIDevice currentDevice].proximityMonitoringEnabled = NO; + if (!m_proximitySensorCallback) + return; + [m_proximitySensorCallback release]; m_proximitySensorCallback = 0; + if (--s_startCount == 0) + [UIDevice currentDevice].proximityMonitoringEnabled = NO; } QT_END_NAMESPACE |