X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fvcd%2Fvcd.c;h=e94dc617293b208a380543929c1c434606987c20;hb=ddb69692c44d26b2c7454d807c04a52464febf25;hp=0b62bc2592ea89c7a97d991a9a8a5a7fbee14861;hpb=583ea37e5f9af2c88f3fca215c06c1a6be424cec;p=vlc

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 0b62bc2592..e94dc61729 100644
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -59,8 +59,7 @@ vlc_module_begin ()
     add_usage_hint( N_("[vcd:][device][@[title][,[chapter]]]") )
     add_integer( "vcd-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
-    add_shortcut( "vcd" )
-    add_shortcut( "svcd" )
+    add_shortcut( "vcd", "svcd" )
 vlc_module_end ()
 
 /*****************************************************************************
@@ -96,7 +95,10 @@ static int Open( vlc_object_t *p_this )
 {
     access_t     *p_access = (access_t *)p_this;
     access_sys_t *p_sys;
-    char *psz_dup = ToLocaleDup( p_access->psz_path );
+    if( p_access->psz_filepath == NULL )
+        return VLC_EGENERIC;
+
+    char *psz_dup = ToLocaleDup( p_access->psz_filepath );
     char *psz;
     int i_title = 0;
     int i_chapter = 0;
@@ -255,7 +257,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             *va_arg( args, int64_t * )
-                     = (int64_t)var_GetInteger(p_access,"vcd-caching") * 1000;
+                     = var_GetInteger(p_access,"vcd-caching") * 1000;
             break;
 
         /* */