summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBernd Weimer <bweimer@blackberry.com>2013-05-03 11:27:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-06 10:45:08 +0200
commita8bb2b1720372b79b1e7c03692252a3d6f0a7c0f (patch)
tree7cc19be29b743baeab456f218d0ed7e4c9611b76 /src
parent71b3901b45d44dde24684ed54d87b082c231409c (diff)
BlackBerry: Fix for GeoValues support
Generic QSensor("QMagnetometer") crashed, because of a null pointer access. Fixed by disabling geo values support for generic magnetometer sensors. Change-Id: Ie3e654df10f325ff42cd3a08c3108e9b7a84604f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sensors/blackberry/bbmagnetometer.cpp4
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;