From 93065af3edb60fef45f693152e14a10e7d2cce1b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 1 Mar 2014 00:38:17 +0100 Subject: client API: fix timeout handling (Again.) Fixed Lua timers as well. --- player/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'player') diff --git a/player/client.c b/player/client.c index 824389335d..675410893d 100644 --- a/player/client.c +++ b/player/client.c @@ -13,6 +13,7 @@ #include #include +#include #include #include "common/common.h" @@ -452,7 +453,9 @@ mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout) break; if (timeout <= 0) break; - pthread_cond_timedwait(&ctx->wakeup, &ctx->lock, &deadline); + int r = pthread_cond_timedwait(&ctx->wakeup, &ctx->lock, &deadline); + if (r == ETIMEDOUT) + break; } ctx->queued_wakeup = false; -- cgit v1.2.3