fix(timer): the callback will still run after the timer is removed

lc-soft · Mar 1, 2020 · 43233b3 · 43233b3
1 parent 85a1739
commit 43233b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/gui/widget/textcaret.c b/src/gui/widget/textcaret.c
@@ -140,7 +140,7 @@ static void TextCaret_OnDestroy(LCUI_Widget widget)
 
 	caret = Widget_GetData(widget, prototype);
 	caret->task->active = FALSE;
-	if (LCUITimer_Free(caret->timer_id) == 0) {
+	if (LCUITimer_Free(caret->timer_id) != -1) {
 		free(caret->task);
 		caret->task = NULL;
 	}

diff --git a/src/timer.c b/src/timer.c
@@ -130,7 +130,7 @@ int LCUITimer_Free(int timer_id)
 {
 	Timer timer;
 	if (!self.active) {
-		return -1;
+		return -2;
 	}
 	LCUIMutex_Lock(&self.mutex);
 	timer = FindTimer(timer_id);
@@ -148,7 +148,7 @@ int LCUITimer_Pause(int timer_id)
 {
 	Timer timer;
 	if (!self.active) {
-		return -1;
+		return -2;
 	}
 	LCUIMutex_Lock(&self.mutex);
 	timer = FindTimer(timer_id);
@@ -165,7 +165,7 @@ int LCUITimer_Continue(int timer_id)
 {
 	Timer timer;
 	if (!self.active) {
-		return -1;
+		return -2;
 	}
 	LCUIMutex_Lock(&self.mutex);
 	timer = FindTimer(timer_id);
@@ -183,7 +183,7 @@ int LCUITimer_Reset(int timer_id, long int n_ms)
 {
 	Timer timer;
 	if (!self.active) {
-		return -1;
+		return -2;
 	}
 	LCUIMutex_Lock(&self.mutex);
 	timer = FindTimer(timer_id);
@@ -233,7 +233,7 @@ size_t LCUI_ProcessTimers(void)
 		}
 		/* 若需要重复使用，则重置剩余等待时间 */
 		LinkedList_Unlink(&self.timers, node);
-		LCUI_PostSimpleTask(timer->callback, timer->arg, NULL);
+		timer->callback(timer->arg);
 		if (timer->reuse) {
 			timer->pause_ms = 0;
 			timer->start_time = LCUI_GetTime();