vlc | branch: master | Thomas Guillem <[email protected]> | Tue May 7 15:53:49 2019 +0200| [06964b153b5ff57024477ac40759477413955249] | committer: Thomas Guillem
window: don't disable twice > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06964b153b5ff57024477ac40759477413955249 --- 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 b64c35bdec..27a269e9d9 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1715,6 +1715,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"); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
