[vlc-devel] commit: Fix use of --data-path ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 23 19:19:19 2010 +0200| [80b17e25cc1287ca582520f6a48e68ca465bf8db] | committer: Rémi Denis-Courmont 

Fix use of --data-path

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=80b17e25cc1287ca582520f6a48e68ca465bf8db
---

 src/config/dirs.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/config/dirs.c b/src/config/dirs.c
index 695b945..d05a9f3 100644
--- 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" );
-    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();
 }