Merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1197908 into lp:ubuntu-clock-app/saucy

[Paolo Rotolo]

Timer: fixed hands reset (LP: #1197908).

Timer: fixed hands reset.
Please see: https://bugs.launchpad.net/ubuntu-clock-app/+bug/1197908

[lp:~paolorotolo/ubuntu-clock-app/fix-for-1197908]

183. By Paolo Rotolo on 2013-09-05

* Added search_timer.start();
* Fixed typo.

[Nekhelesh Ramananthan (nik90)]

Testing fix now many times to ensure it is not reproducible any more.

[Nekhelesh Ramananthan (nik90)]

After testing it few more times, I can concur that this bug is finally fixed. Thank you very much Paolo!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'timer/AnalogTimer.qml'
--- timer/AnalogTimer.qml	2013-09-03 19:22:41 +0000
+++ timer/AnalogTimer.qml	2013-09-05 17:01:01 +0000
@@ -41,6 +41,7 @@
     // Timer function called by the main clock loop
     function onTimerUpdate () {
         if( timerOn ) {
+            inProgressFlag = true;
             remTime = totalTime - Math.floor((new Date() - startTime)/ 1000) - pauseTime;
 
             if (remTime < 0) {
@@ -64,14 +65,26 @@
     }
 
     // Function to disable timer and reset time
+    Timer {
+        id: reset_timer
+
+        interval: 200
+        repeat: false
+        onTriggered: {
+            inProgressFlag = true;
+            hourHand.rotationValue = minuteHand.rotationValue = secondHand.rotationValue = 0;
+            inProgressFlag = false;
+        }
+    }
+
     function reset() {
+        reset_timer.start();
         timerOn = false;
         state = "";
         startTime = remTime = pauseTime = 0;
-        hourHand.rotationValue = minuteHand.rotationValue = secondHand.rotationValue = 0;
         hours = minutes = seconds = totalTime = 0;
         hourHand.timerValue = minuteHand.timerValue = secondHand.timerValue = 0;
-    }    
+    }
 
     Repeater {
         model: 12