From ab1c97fb2b189ca37b6cef8fc87600ff40f2594d Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Thu, 29 May 2014 13:57:15 -0400 Subject: [PATCH] properly set default user settings --- src/settings.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/settings.c b/src/settings.c index 0e14d9d..49b4f28 100644 --- a/src/settings.c +++ b/src/settings.c @@ -96,6 +96,17 @@ static void uset_hst_size(struct user_settings *s, int val) s->history_size = (val > MAX_HISTORY || val < MIN_HISTORY) ? DFLT_HST_SIZE : val; } +static void set_default_settings(struct user_settings *s) +{ + uset_autolog(s, AUTOLOG_OFF); + uset_time(s, TIME_24); + uset_alerts(s, ALERTS_ENABLED); + uset_colours(s, DFLT_COLS); + uset_ain_dev(s, 0); + uset_aout_dev(s, 0); + uset_hst_size(s, DFLT_HST_SIZE); +} + int settings_load(struct user_settings *s, char *path) { char *user_config_dir = get_user_config_dir(); @@ -111,7 +122,7 @@ int settings_load(struct user_settings *s, char *path) free(user_config_dir); - uset_hst_size(s, DFLT_HST_SIZE); /* must be forced in case no setting specified */ + set_default_settings(s); if (fp == NULL && !path) { if ((fp = fopen(dflt_path, "w")) == NULL)