[vlc-devel] [PATCH 1/2] bluray: fix abort() when empty overlay is closed

[Petri Hintukainen]

HDMV titles can construct empty overlay with invisible buttons to enable navigation.
This is used in ex. photo galleries (to flip image) and with audio navigation ("spoken menu").
---
 modules/access/bluray.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index a3da721b..8192789 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -794,10 +794,12 @@ static void blurayCloseOverlay(demux_t *p_demux, int plane)
             return;
 
     /* All overlays have been closed */
-    var_DelCallback(p_sys->p_vout, "mouse-moved", onMouseEvent, p_demux);
-    var_DelCallback(p_sys->p_vout, "mouse-clicked", onMouseEvent, p_demux);
-    vlc_object_release(p_sys->p_vout);
-    p_sys->p_vout = NULL;
+    if (p_sys->p_vout != NULL) {
+        var_DelCallback(p_sys->p_vout, "mouse-moved", onMouseEvent, p_demux);
+        var_DelCallback(p_sys->p_vout, "mouse-clicked", onMouseEvent, p_demux);
+        vlc_object_release(p_sys->p_vout);
+        p_sys->p_vout = NULL;
+    }
 }
 
 /*
-- 
1.8.3.2