X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fcfg.c;h=d9034783ccc72db6ba42e1f95657de573a91bcbf;hp=d94f256aa221a8fdbb5c41b13ba2fad3756c39c8;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=4270c903e8007017b80c6c817dd41cf699f00df1 diff --git a/src/cfg.c b/src/cfg.c index d94f256..d903478 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -445,6 +445,8 @@ struct config *config_load(void) c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS); + c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP); + if (!c->window_restore_enabled || !c->window_w || !c->window_h) { c->window_w = 800; c->window_h = 200; @@ -602,7 +604,10 @@ static char *sensor_get_str(const char *sid, const char *att) return g_key_file_get_string(kfile, sid, att, NULL); } -static bool sensor_get_double(const char *sid, const char *att, double *d) +static bool sensor_get_double(const char *sid, + const char *att, + double *d, + double d_default) { GKeyFile *kfile; GError *err; @@ -611,6 +616,18 @@ static bool sensor_get_double(const char *sid, const char *att, double *d) kfile = get_sensor_key_file(); err = NULL; + if (!g_key_file_has_key(kfile, sid, att, &err)) { + if (err) { + log_err(err->message); + g_error_free(err); + return false; + } + + *d = d_default; + return true; + } + + err = NULL; v = g_key_file_get_double(kfile, sid, att, &err); if (err) { @@ -770,9 +787,11 @@ void config_set_sensor_graph_enabled(const char *sid, bool enabled) sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled); } -bool config_get_sensor_alarm_high_threshold(const char *sid, double *v) +bool config_get_sensor_alarm_high_threshold(const char *sid, + double *v, + double d) { - return sensor_get_double(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, v); + return sensor_get_double(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, v, d); } void config_set_sensor_alarm_high_threshold(const char *sid, int threshold) @@ -780,9 +799,9 @@ void config_set_sensor_alarm_high_threshold(const char *sid, int threshold) sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold); } -bool config_get_sensor_alarm_low_threshold(const char *sid, double *v) +bool config_get_sensor_alarm_low_threshold(const char *sid, double *v, double d) { - return sensor_get_double(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, v); + return sensor_get_double(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, v, d); } void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)