[vlc-devel] [PATCH] win32: simplify vlc_join()
RĂ©mi Denis-Courmont
remi at remlab.net
Wed Feb 19 18:30:43 CET 2020
There are no needs for a cancellation point here.
---
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;
--
2.25.0
More information about the vlc-devel
mailing list