Browse Source

Merge pull request #8251 from cynicaldevil/master

Previous value of time_left is added to wait_time before assigning to time_left
Rémi Verschelde 8 years ago
parent
commit
57badfd1df
1 changed files with 1 additions and 2 deletions
  1. 1 2
      scene/main/timer.cpp

+ 1 - 2
scene/main/timer.cpp

@@ -66,8 +66,7 @@ void Timer::_notification(int p_what) {
 
 			if (time_left < 0) {
 				if (!one_shot)
-					//time_left = wait_time + time_left;
-					time_left = wait_time;
+					time_left = wait_time + time_left;
 				else
 					stop();
 				emit_signal("timeout");