[vlc-devel] [PATCH 1/2] video_output: don't cancel anything if the display module is not started

[Steve Lhomme]

In this case sys->display_pool is possibly NULL, so let's not use it.
---
 src/video_output/video_output.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 379cb257274..8c214a75765 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1628,7 +1628,8 @@ void vout_Cancel(vout_thread_t *vout, bool canceled)
 {
     vout_thread_sys_t *sys = vout->p;
     assert(!sys->dummy);
-    assert(sys->display);
+    if (!sys->display)
+        return;
 
     vout_control_Hold(&sys->control);
     if (sys->decoder_pool != NULL)
-- 
2.17.1