[sensorfwd] Fixes MER#1170 fix crash in internal compass

with no orientation sensor, do no try to access null object.
sailfishos · Jul 16, 2015 · 476cb6c · 476cb6c
1 parent 2575a2f
commit 476cb6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/chains/compasschain/compasschain.cpp b/chains/compasschain/compasschain.cpp
@@ -45,7 +45,7 @@ CompassChain::CompassChain(const QString& id) :
 
     if (sm.getAdaptorTypes().contains("orientationadaptor")) {
         orientAdaptor = sm.requestDeviceAdaptor("orientationadaptor");
-        if (orientAdaptor->isValid()) {
+        if (orientAdaptor && orientAdaptor->isValid()) {
             hasOrientationAdaptor = true;
         }
     }

diff --git a/chains/magcalibrationchain/magcalibrationchain.cpp b/chains/magcalibrationchain/magcalibrationchain.cpp
@@ -71,7 +71,7 @@ MagCalibrationChain::MagCalibrationChain(const QString& id) :
 
     if (sm.getAdaptorTypes().contains("orientationadaptor")) {
         DeviceAdaptor *orientAdaptor = sm.requestDeviceAdaptor("orientationadaptor");
-        if (orientAdaptor->isValid()) {
+        if (orientAdaptor && orientAdaptor->isValid()) {
             needsCalibration = false;
         }
     }