diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:23 +0200 |
| commit | cbd16183528d6e6127891801048dc16014d26ae5 (patch) | |
| tree | 9f0878ccbdb7e197029a9631b5fd8fb06e96a7b2 /src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | |
| parent | c333d25a2a89aeefa936810945fe965cf1086797 (diff) | |
| parent | 26c99a8f7832a5549d315ad434e038ae3964e224 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I06a505894844bfd17eb07106bed0c07ca2f9f79c
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp')
| -rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp index 82302acd..8052b766 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp @@ -294,7 +294,8 @@ bool SensorfwSensorBase::initSensorInterface(QString const &name) void SensorfwSensorBase::standyOverrideChanged() { - m_sensorInterface->setStandbyOverride(sensor()->isAlwaysOn()); + if (m_sensorInterface) + m_sensorInterface->setStandbyOverride(sensor()->isAlwaysOn()); } bool SensorfwSensorBase::isFeatureSupported(QSensor::Feature feature) const |