1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-07-03 17:37:47 +02:00
This commit is contained in:
Jfreegman 2014-04-20 16:42:37 -04:00
parent 93d77fdeca
commit 9b997fbf01
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63

View File

@ -47,7 +47,7 @@ struct {
{ "audio_out_dev", uset_aout_dev }, { "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 */ /* default off if invalid value */
s->autolog = val == AUTOLOG_ON ? AUTOLOG_ON : AUTOLOG_OFF; 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); free(user_config_dir);
if (fp == NULL) { if (fp == NULL && !path) {
if ((fp = fopen(dflt_path, "w")) == NULL) if ((fp = fopen(dflt_path, "w")) == NULL)
return -1; return -1;
} else if (fp == NULL && path) {
return -1;
} }
char line[MAX_STR_SIZE]; char line[MAX_STR_SIZE];