summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sensors/android/src/androidaccelerometer.cpp2
-rw-r--r--src/plugins/sensors/android/src/main.cpp7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/sensors/android/src/androidaccelerometer.cpp b/src/plugins/sensors/android/src/androidaccelerometer.cpp
index 5a42d0cb..76aa0278 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.cpp
+++ b/src/plugins/sensors/android/src/androidaccelerometer.cpp
@@ -89,8 +89,8 @@ AndroidSensors::AndroidSensorType AndroidAccelerometer::modeToSensor(QAccelerome
case QAccelerometer::User:
type = AndroidSensors::TYPE_LINEAR_ACCELERATION;
break;
- default:
case QAccelerometer::Combined:
+ default:
type = AndroidSensors::TYPE_ACCELEROMETER;
break;
}
diff --git a/src/plugins/sensors/android/src/main.cpp b/src/plugins/sensors/android/src/main.cpp
index 3326208b..3d8604fe 100644
--- a/src/plugins/sensors/android/src/main.cpp
+++ b/src/plugins/sensors/android/src/main.cpp
@@ -112,10 +112,11 @@ public:
{
AndroidSensorType type = static_cast<AndroidSensorType>(sensor->identifier().toInt());
switch (type) {
- case TYPE_ACCELEROMETER:
- {
+ case TYPE_ACCELEROMETER: {
QAccelerometer * const accelerometer = qobject_cast<QAccelerometer *>(sensor);
- AndroidSensors::AndroidSensorType type = AndroidAccelerometer::modeToSensor(accelerometer->accelerationMode());
+ AndroidSensors::AndroidSensorType type
+ = accelerometer ? AndroidAccelerometer::modeToSensor(accelerometer->accelerationMode())
+ : AndroidSensors::TYPE_ACCELEROMETER;
return new AndroidAccelerometer(type, sensor);
}
case TYPE_AMBIENT_TEMPERATURE: