X-Git-Url: https://wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=a1af9bc77f50ee388a7cf06b85bfc2202ccc8fc2;hb=912b5d1986633786a656bb3361f7ae9c1263acef;hp=1eea59420cc7cd21d1e199349b90ed8847306df6;hpb=39897615ff371e114e74dea464737df98c0684c6;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 1eea594..a1af9bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -228,6 +228,7 @@ static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	struct psensor **sensor_cur = sensors;
+	bool ret;
 
 	while (*sensor_cur) {
 		struct psensor *s = *sensor_cur;
@@ -235,10 +236,17 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		s->cb_alarm_raised = cb_alarm_raised;
 		s->cb_alarm_raised_data = ui;
 
-		s->alarm_high_threshold
-			= config_get_sensor_alarm_high_threshold(s->id);
-		s->alarm_low_threshold
-			= config_get_sensor_alarm_low_threshold(s->id);
+		ret = config_get_sensor_alarm_high_threshold
+			(s->id, &s->alarm_high_threshold);
+
+		if (!ret && s->max != UNKNOWN_DBL_VALUE)
+			s->alarm_high_threshold = s->max;
+
+		ret = config_get_sensor_alarm_low_threshold
+			(s->id, &s->alarm_low_threshold);
+
+		if (!ret && s->min != UNKNOWN_DBL_VALUE)
+			s->alarm_low_threshold = s->min;
 
 		sensor_cur++;
 	}