From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Wed, 12 Feb 2014 20:37:50 +0000 (+0200)
Subject: bluray: fix setting parent input
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=332f4b09cbec96cf43dd4c681087336f33d2f727;p=vlc

bluray: fix setting parent input

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index d50bc689bc..c7e27b328b 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -393,13 +393,13 @@ static int blurayOpen(vlc_object_t *object)
 
     /* Registering overlay event handler */
     bd_register_overlay_proc(p_sys->bluray, p_demux, blurayOverlayProc);
+    p_sys->p_input = demux_GetParentInput(p_demux);
+    if (unlikely(!p_sys->p_input)) {
+        msg_Err(p_demux, "Could not get parent input");
+        goto error;
+    }
 
     if (p_sys->b_menu) {
-        p_sys->p_input = demux_GetParentInput(p_demux);
-        if (unlikely(!p_sys->p_input)) {
-            msg_Err(p_demux, "Could not get parent input");
-            goto error;
-        }
 
         /* Register ARGB overlay handler for BD-J */
         if (disc_info->num_bdj_titles)