[vlc-devel] [PATCH] window: don't disable twice

[Thomas Guillem]

---
 src/video_output/video_output.c | 2 ++
 src/video_output/window.c       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index c0c0fc0ecf..8de3aaa6d2 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1759,6 +1759,8 @@ void vout_Release(vout_thread_t *vout)
     vlc_mutex_destroy(&vout->p->spu_lock);
     vlc_mutex_destroy(&vout->p->filter.lock);
 
+    if (sys->window_active)
+        vout_window_Disable(sys->display_cfg.window);
     vout_display_window_Delete(sys->display_cfg.window);
 
     vout_control_Clean(&vout->p->control);
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 5958a1ccac..99a6d62454 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -377,7 +377,6 @@ void vout_display_window_Delete(vout_window_t *window)
     vout_thread_t *vout = (vout_thread_t *)vlc_object_parent(window);
     vout_display_window_t *state = window->owner.sys;
 
-    vout_window_Disable(window);
     vout_window_Delete(window);
     var_Destroy(vout, "window-fullscreen-output");
     var_Destroy(vout, "window-fullscreen");
-- 
2.20.1