diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-04 00:22:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 00:22:44 +0200 |
| commit | 57badfd1df3a554b7f47793e73a887874e5ca2b1 (patch) | |
| tree | 421d5cd1a3a45c7a99018fc1469c28b1ebfe59c1 /scene/main/timer.cpp | |
| parent | 4d3ed11212c779a1c340916dee47b2021382047f (diff) | |
| parent | ea4fbee8f2778bc864cb930c69016cb175812da7 (diff) | |
Merge pull request #8251 from cynicaldevil/master
Previous value of time_left is added to wait_time before assigning to time_left
Diffstat (limited to 'scene/main/timer.cpp')
| -rwxr-xr-x | scene/main/timer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 2263e82312..7e3c5db5bc 100755 --- a/scene/main/timer.cpp +++ b/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"); |