From 9b997fbf01e1e25500b511596233034c2686ecd7 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sun, 20 Apr 2014 16:42:37 -0400 Subject: [PATCH] fix bug --- src/settings.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/settings.c b/src/settings.c index a4f85a1..6e6ebad 100644 --- a/src/settings.c +++ b/src/settings.c @@ -47,7 +47,7 @@ struct { { "audio_out_dev", uset_aout_dev }, }; -static void uset_autolog(struct user_settings *s, int val) +static void uset_autolog(struct user_settings *s, int val) { /* default off if invalid value */ s->autolog = val == AUTOLOG_ON ? AUTOLOG_ON : AUTOLOG_OFF; @@ -102,9 +102,11 @@ int settings_load(struct user_settings *s, char *path) free(user_config_dir); - if (fp == NULL) { + if (fp == NULL && !path) { if ((fp = fopen(dflt_path, "w")) == NULL) return -1; + } else if (fp == NULL && path) { + return -1; } char line[MAX_STR_SIZE];