[vlc-commits] Revert "interrupt: restore interrupted to the killed state"

Thomas Guillem git at videolan.org
Thu Oct 24 18:09:35 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Oct 24 09:05:04 2019 +0200| [0cd8f8fd9067ee3caccf9803a836e5d80f88c3ee] | committer: Thomas Guillem

Revert "interrupt: restore interrupted to the killed state"

Reverted because it will cause live loops, as it becomes impossible to poll
after kill.

This reverts commit 2ec2e558d860ed1b2243a576e8e99e396304cd8d.

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

 src/misc/interrupt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
index 54810892fc..d2a04a72b3 100644
--- a/src/misc/interrupt.c
+++ b/src/misc/interrupt.c
@@ -151,7 +151,7 @@ static int vlc_interrupt_finish(vlc_interrupt_t *ctx)
     if (ctx->interrupted)
     {
         ret = EINTR;
-        ctx->interrupted = atomic_load(&ctx->killed);
+        ctx->interrupted = false;
     }
     vlc_mutex_unlock(&ctx->lock);
     return ret;



More information about the vlc-commits mailing list