X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfig%2Ffile.c;h=84ebec6abcdb33d39f5f1d0b55742e4698a1be34;hb=09bd8efc4011b0fc1ab42163a2d312c5daac63b2;hp=e1162bdec244c005e47ab86e73432515b84f753a;hpb=821f7242a79241034415b46f5683ec485f75e760;p=vlc diff --git a/src/config/file.c b/src/config/file.c index e1162bdec2..84ebec6abc 100644 --- a/src/config/file.c +++ b/src/config/file.c @@ -59,7 +59,7 @@ static char *config_GetConfigFile( vlc_object_t *obj ) char *psz_file = config_GetPsz( obj, "config" ); if( psz_file == NULL ) { - char *psz_dir = config_GetUserConfDir(); + char *psz_dir = config_GetUserDir( VLC_CONFIG_DIR ); if( asprintf( &psz_file, "%s" DIR_SEP CONFIG_FILE, psz_dir ) == -1 ) psz_file = NULL; @@ -385,8 +385,8 @@ config_Write (FILE *file, const char *desc, const char *type, static int config_PrepareDir (vlc_object_t *obj) { - char *psz_configdir = config_GetUserConfDir (); - if (psz_configdir == NULL) /* XXX: This should never happen */ + char *psz_configdir = config_GetUserDir (VLC_CONFIG_DIR); + if (psz_configdir == NULL) return -1; int ret = config_CreateDir (obj, psz_configdir);