Fix use of --data-path

80b17e25 · Rémi Denis-Courmont · 1fa88f66 · 80b17e25
Commit 80b17e25 authored Jan 23, 2010 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

src/config/dirs.c src/config/dirs.c +2 -5

No files found.
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -37,10 +37,7 @@
 */
 char *__config_GetDataDir( vlc_object_t *p_obj )
 {
-    char *psz_path = config_GetPsz( p_obj, "data-path" );
+    char *psz_path = var_InheritString( p_obj, "data-path" );
-    if( psz_path && *psz_path )
+    return psz_path ? psz_path : config_GetDataDirDefault();
-        return psz_path;
-    free( psz_path );
-    return config_GetDataDirDefault();
 }