summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-25 00:52:44 +0100
committerwm4 <wm4@nowhere>2015-01-25 00:52:44 +0100
commit99c856d3cd2ebad7db58519dc6a8902b1d274512 (patch)
tree88c0633bb5a7ac4d4235a1e107f7ee97c983c70f
parent0e69c1c5af01a499b4699abfdbfa0cf87b4f9142 (diff)
downloadmpv-99c856d3cd2ebad7db58519dc6a8902b1d274512.tar.bz2
mpv-99c856d3cd2ebad7db58519dc6a8902b1d274512.tar.xz
vo: fix redraw logic
It actually can and does happen that you want to redraw, even if no image was queued yet. Broken by commit 28582322. Fixes #1510.
-rw-r--r--video/out/vo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index aee2dd8c75..5bb28bef54 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -695,11 +695,9 @@ static void do_redraw(struct vo *vo)
in->dropped_frame = false;
pthread_mutex_unlock(&in->lock);
- if (!img)
- return;
-
if (full_redraw || vo->driver->control(vo, VOCTRL_REDRAW_FRAME, NULL) < 1) {
- vo->driver->draw_image(vo, img);
+ if (img)
+ vo->driver->draw_image(vo, img);
} else {
talloc_free(img);
}