RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

client API: fix mpv_wakeup() 

Of course this was going to get stuck in the retry loop.

Fixes #1372.
This commit is contained in:
wm4 2014-12-22 01:53:39 +01:00
parent bdae2f8fa8
commit 4b4d3a57bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
player/client.c
View File

@ -706,8 +706,6 @@ mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout)
if (timeout < 0)
timeout = 1e20;
if (ctx->queued_wakeup)
timeout = 0;
int64_t deadline = mp_add_timeout(mp_time_us(), timeout);
@ -715,6 +713,8 @@ mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout)
talloc_free_children(event);
while (1) {
if (ctx->queued_wakeup)
deadline = 0;
// This will almost surely lead to a deadlock. (Polling is still ok.)
if (ctx->suspend_count && timeout > 0) {
MP_ERR(ctx, "attempting to wait while core is suspended");