[vlc-commits] win32: simplify vlc_join()

Rémi Denis-Courmont git at videolan.org
Fri Feb 21 18:26:15 CET 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 19 19:30:08 2020 +0200| [db1fdee136470892b59f596ba07c42ce45185a26] | committer: Rémi Denis-Courmont

win32: simplify vlc_join()

There are no needs for a cancellation point here.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db1fdee136470892b59f596ba07c42ce45185a26
---

 src/win32/thread.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/win32/thread.c b/src/win32/thread.c
index 59d55b3925..933b7ee9d2 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -514,11 +514,10 @@ void vlc_join (vlc_thread_t th, void **result)
 
     do
     {
-        vlc_testcancel ();
-        ret = WaitForSingleObjectEx(th->id, INFINITE, TRUE);
+        ret = WaitForSingleObject(th->id, INFINITE);
         assert(ret != WAIT_ABANDONED_0);
     }
-    while (ret == WAIT_IO_COMPLETION || ret == WAIT_FAILED);
+    while (ret == WAIT_FAILED);
 
     if (result != NULL)
         *result = th->data;



More information about the vlc-commits mailing list