access/access_demux: check psz_access rather than b_force

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 75b8cc0d2f32d4645958ff84f4873ad1f42cfc40..6dface0daa05b8b837f749e55ab34210ea1158c6 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -142,7 +142,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_access->psz_path || !*p_access->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_access->psz_access || !*p_access->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "cd-audio" );
         if( !psz_name || !*psz_name )

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 82dedfb68b7e3178c0ead81e93e37436e22c8b2b..3743cf81ae80f89666f70cba357e1e4e2e36662f 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -183,7 +183,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_demux->psz_path || !*p_demux->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_demux->psz_access || !*p_demux->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "dvd" );
         if( !psz_name )

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 641fab5ed7b05ff47f7234ea5fca2ac7593de913..bd858469f529a3bc6b8547515b3be732a8d20fa3 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -204,7 +204,8 @@ static int Open( vlc_object_t *p_this )
     if( !p_demux->psz_path || !*p_demux->psz_path )
     {
         /* Only when selected */
-        if( !p_this->b_force ) return VLC_EGENERIC;
+        if( !p_demux->psz_access || !*p_demux->psz_access )
+            return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "dvd" );
         if( !psz_name )