diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:18:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:18:07 +0200 |
| commit | e8237a3d19e90c31af6d5a6c5e3a2f7815740226 (patch) | |
| tree | 24696c0400318684bc00cf36d41a445051b67b96 /src/plugins/sensors/blackberry | |
| parent | f57241666fd4b7074cbe33567827293e2a0a9ad5 (diff) | |
| parent | 3d75c54b8d0d055eff2a41cef7733b6204f8241c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d
Diffstat (limited to 'src/plugins/sensors/blackberry')
| -rw-r--r-- | src/plugins/sensors/blackberry/bbmagnetometer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/sensors/blackberry/bbmagnetometer.cpp b/src/plugins/sensors/blackberry/bbmagnetometer.cpp index 45fd49b3..a58dfe91 100644 --- a/src/plugins/sensors/blackberry/bbmagnetometer.cpp +++ b/src/plugins/sensors/blackberry/bbmagnetometer.cpp @@ -56,9 +56,7 @@ bool BbMagnetometer::updateReadingFromEvent(const sensor_event_t &event, QMagnet float x, y, z; QMagnetometer * const magnetometer = qobject_cast<QMagnetometer *>(sensor()); - Q_ASSERT(magnetometer); - const bool returnGeoValues = magnetometer->returnGeoValues(); - if (returnGeoValues) { + if (magnetometer && magnetometer->returnGeoValues()) { switch (event.accuracy) { case SENSOR_ACCURACY_UNRELIABLE: reading->setCalibrationLevel(0.0f); break; case SENSOR_ACCURACY_LOW: reading->setCalibrationLevel(0.1f); break; |