diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:34:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:34:05 +0200 |
| commit | 53a414e33ce45f28b89217678597416b681128d4 (patch) | |
| tree | 51ab26cf4a14662e525c4a648d84dae81090f0c7 /src/plugins/sensors/ios/iosproximitysensor.mm | |
| parent | 3523afa703792fabc8bac3febe5541766bc1ccd4 (diff) | |
| parent | df3374bd4bb8af1494f6a35b1102f15cfe9633e0 (diff) | |
| download | qtsensors-53a414e33ce45f28b89217678597416b681128d4.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaeb7c9f62b50d68e0cedb95c523aebcceb9128c0
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 6a2465b..eae8560 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 |