aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Time
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-11-06 20:36:42 +0800
committerchai <chaifix@163.com>2018-11-06 20:36:42 +0800
commit007695b3828c2ef32c6ae9c619dcdcf2b8633252 (patch)
treeaa884a31f0833ab77ec44ad11220b1983defe2dc /src/libjin/Time
parent72cdbb604b37b4742dffdeb7c031d00e5a6999cd (diff)
*修改计时器
Diffstat (limited to 'src/libjin/Time')
-rw-r--r--src/libjin/Time/je_timer.cpp3
-rw-r--r--src/libjin/Time/je_timer.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libjin/Time/je_timer.cpp b/src/libjin/Time/je_timer.cpp
index fcd805c..8c48634 100644
--- a/src/libjin/Time/je_timer.cpp
+++ b/src/libjin/Time/je_timer.cpp
@@ -38,7 +38,8 @@ namespace JinEngine
void Timer::cancel(Handler* handler)
{
- handler->canceled = true;
+ if(handler != nullptr)
+ handler->canceled = true;
}
void Timer::cancelAll()
diff --git a/src/libjin/Time/je_timer.h b/src/libjin/Time/je_timer.h
index 1310890..603cade 100644
--- a/src/libjin/Time/je_timer.h
+++ b/src/libjin/Time/je_timer.h
@@ -80,7 +80,7 @@ namespace JinEngine
///
///
///
- void cancel(Handler* handler = nullptr);
+ void cancel(Handler* handler);
///
///