access/access_demux: check psz_access rather than b_force
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 28 Jan 2010 18:57:52 +0000 (20:57 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 28 Jan 2010 19:19:55 +0000 (21:19 +0200)
modules/access/cdda.c
modules/access/dvdnav.c
modules/access/dvdread.c

index 75b8cc0..6dface0 100644 (file)
@@ -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 )
index 82dedfb..3743cf8 100644 (file)
@@ -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 )
index 641fab5..bd85846 100644 (file)
@@ -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 )