godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8251 from cynicaldevil/master 

Previous value of time_left is added to wait_time before assigning to time_left
This commit is contained in:
Rémi Verschelde 2017-04-04 00:22:44 +02:00 committed by GitHub
parent 4d3ed11212 ea4fbee8f2
commit 57badfd1df
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/timer.cpp
View File

@ -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");