github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core,timer] fix timer termination

Browse Source
This commit is contained in:
akallabeth 2025-05-22 10:26:10 +02:00
parent 017a4ca0e0
commit 62d86d0779
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp/core/timer.c
View File

@ -186,7 +186,8 @@ static DWORD WINAPI timer_thread(LPVOID arg)
DWORD timeout = INFINITE;
HANDLE handles[2] = { utils_get_abort_event(timer->rdp), timer->event };
while (WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, timeout) != WAIT_OBJECT_0)
while (timer->running &&
(WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, timeout) != WAIT_OBJECT_0))
{
(void)ResetEvent(timer->event);
const uint64_t next = expire_and_reschedule(timer);
@ -211,9 +212,10 @@ void freerdp_timer_free(FreeRDPTimer* timer)
if (!timer)
return;
timer->running = false;
if (timer->event)
(void)SetEvent(timer->event);
timer->running = false;
if (timer->thread)
{
(void)WaitForSingleObject(timer->thread, INFINITE);