From 9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 18 Jun 2014 20:04:59 +0200 Subject: video/out: fix redrawing with no video frame for some VOs With the change to merge osd drawing into video frame drawing, some bogus logic got in: they skipped drawing the OSD if no video frame is available. This broke --no-video --force-window mode. --- video/out/vo_direct3d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'video/out/vo_direct3d.c') diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 927730d517..902d437ce3 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -846,7 +846,7 @@ static uint32_t d3d_draw_frame(d3d_priv *priv) IDirect3DDevice9_Clear(priv->d3d_device, 0, NULL, D3DCLEAR_TARGET, 0, 0, 0); if (!priv->have_image) - return VO_TRUE; + goto render_osd; if (priv->use_textures) { @@ -912,6 +912,8 @@ static uint32_t d3d_draw_frame(d3d_priv *priv) } } +render_osd: + draw_osd(priv->vo); return VO_TRUE; -- cgit v1.2.3