finalize slam gesture, and fix up some others.

Change-Id: I307492e32ea04d29d8f29cc91f40298d00ae7201
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
index 4869f7e4..3ed4b900 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
@@ -60,7 +60,8 @@ inline qreal calcYaw(double Ax, double Ay, double Az)
 }
 
 QWhipSensorGestureRecognizer::QWhipSensorGestureRecognizer(QObject *parent) :
-    QSensorGestureRecognizer(parent), whipIt(0), lastX(0)
+    QSensorGestureRecognizer(parent), whipIt(0), lastX(0),
+    detectedX(0)
 {
 }
 
@@ -137,8 +138,7 @@ void QWhipSensorGestureRecognizer::accelChanged()
     if (whipIt) {
         if (((!wasNegative && difference > accelRange * WHIP_THRESHOLD_FACTOR)
                 || (wasNegative && difference < -accelRange * WHIP_THRESHOLD_FACTOR))
-                && abs(degreesZ) < WHIP_DEGREES
-                && abs(detectedX) < abs(x)) {
+                && abs(degreesZ) < WHIP_DEGREES) {
             Q_EMIT whip();
             Q_EMIT detected("whip");
             whipIt = false;
@@ -148,7 +148,6 @@ void QWhipSensorGestureRecognizer::accelChanged()
                  || (difference < 0 && difference > -accelRange * WHIP_DETECTION_FACTOR))
                && abs(degreesZ) < WHIP_DEGREES
                && orientation->reading()->orientation() != QOrientationReading::FaceUp) {
-
         detectedX = x;
 //        start of gesture
         timer->start();