From 7bd6e910c3db3a4e663712dad0947f45a941cb9f Mon Sep 17 00:00:00 2001
From: ce72 <christoph.ernst72@googlemail.com>
Date: Mon, 27 Mar 2023 22:49:51 +0200
Subject: [PATCH] chore: merge upstream changes

---
 pkg/models/tasks.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index 2e82c359b..7db8929bf 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -1513,24 +1513,21 @@ func (t *Task) overwriteRemindersWithReminderDates(reminderDates []time.Time) {
 func updateRelativeReminderDates(task *Task) (err error) {
 	for _, reminder := range task.Reminders {
 		relativeDuration := time.Duration(reminder.RelativePeriod) * time.Second
+		if reminder.RelativeTo != "" {
+			reminder.Reminder = time.Time{}
+		}
 		switch reminder.RelativeTo {
 		case ReminderRelationDueDate:
 			if !task.DueDate.IsZero() {
 				reminder.Reminder = task.DueDate.Add(relativeDuration)
-			} else {
-				reminder.Reminder = time.Time{}
 			}
 		case ReminderRelationStartDate:
 			if !task.StartDate.IsZero() {
 				reminder.Reminder = task.StartDate.Add(relativeDuration)
-			} else {
-				reminder.Reminder = time.Time{}
 			}
 		case ReminderRelationEndDate:
 			if !task.EndDate.IsZero() {
 				reminder.Reminder = task.EndDate.Add(relativeDuration)
-			} else {
-				reminder.Reminder = time.Time{}
 			}
 		default:
 			if reminder.RelativePeriod != 0 {