]> git.sesse.net Git - vlc/commitdiff
Fix use of --data-path
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 17:19:19 +0000 (19:19 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 17:19:19 +0000 (19:19 +0200)
src/config/dirs.c

index 695b9455508dcc9781cac238ed6a21f79a54d34f..d05a9f3db29891dbeed93d0d417227b4a2da25cf 100644 (file)
  */
 char *__config_GetDataDir( vlc_object_t *p_obj )
 {
-    char *psz_path = config_GetPsz( p_obj, "data-path" );
-    if( psz_path && *psz_path )
-        return psz_path;
-    free( psz_path );
-    return config_GetDataDirDefault();
+    char *psz_path = var_InheritString( p_obj, "data-path" );
+    return psz_path ? psz_path : config_GetDataDirDefault();
 }