summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-01 11:44:02 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-01 11:44:02 -0300
commitbf53b7789a3de5d7f7e82b30c87b59544b900c1f (patch)
treec3b2df360ef17664427d6462d0ed48f8331b5dfe /scene
parentc08597aa6497a7cb14f494a76a1b8a172dc2d87b (diff)
-fix timer behavior described, closes #1455
Diffstat (limited to 'scene')
-rw-r--r--scene/main/timer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index e59fd6fb75..2e3e7db0ad 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -46,6 +46,8 @@ void Timer::_notification(int p_what) {
} break;
case NOTIFICATION_PROCESS: {
+ if (!is_processing())
+ return;
time_left -= get_process_delta_time();
if (time_left<0) {