From a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f Mon Sep 17 00:00:00 2001 From: Bernd Weimer Date: Fri, 3 May 2013 11:27:00 +0200 Subject: 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 --- src/plugins/sensors/blackberry/bbmagnetometer.cpp | 4 +--- 1 file changed, 1 insertion(+), 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(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; -- cgit v1.2.3