# HG changeset patch # User edouard # Date 1254745915 -7200 # Node ID b2d2c3fab094f956bf8882f36add2facd37a8fcb # Parent fff2177644318261cfedc18d61a630c7d51dd9c0 Added timeout for waiting timer thread end on windows. diff -r fff217764431 -r b2d2c3fab094 drivers/timers_win32/timers_win32.c --- a/drivers/timers_win32/timers_win32.c Mon Oct 05 11:35:40 2009 +0200 +++ b/drivers/timers_win32/timers_win32.c Mon Oct 05 14:31:55 2009 +0200 @@ -124,7 +124,10 @@ stop_timer = 1; setTimer(0); - WaitForSingleObject(timer_thread, INFINITE); + if(WaitForSingleObject(timer_thread,1000) == WAIT_TIMEOUT) + { + TerminateThread(timer_thread, -1); + } CloseHandle(timer); CloseHandle(timer_thread); }