[vlc-devel] [PATCH 04/48] video_output: no need to check if there's a display to Stop in vout_Close

Steve Lhomme robux4 at ycbcr.xyz
Fri Oct 11 15:33:18 CEST 2019


vout_Close does vout_StopDisplay + vout_DisableWindow

In the case where there is no display (vout_StopDisplay not called) we should
still disable the window before destroying it.
---
 src/video_output/video_output.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 060768e1ab6..2a6ca6fefab 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1769,8 +1769,7 @@ void vout_Close(vout_thread_t *vout)
     vout_thread_sys_t *sys = vout->p;
     assert(!sys->dummy);
 
-    if (sys->display != NULL)
-        vout_Stop(vout);
+    vout_Stop(vout);
 
     vout_IntfDeinit(VLC_OBJECT(vout));
     vout_snapshot_End(sys->snapshot);
-- 
2.17.1



More information about the vlc-devel mailing list