aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appointment.cpp3
-rw-r--r--src/engine-eds.cpp4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/appointment.cpp b/src/appointment.cpp
index 236c5f4..1edd93c 100644
--- a/src/appointment.cpp
+++ b/src/appointment.cpp
@@ -31,8 +31,7 @@ bool Alarm::operator==(const Alarm& that) const
{
return (text==that.text)
&& (audio_url==that.audio_url)
- && (this->time==that.time)
- && (duration==that.duration);
+ && (this->time==that.time);
}
bool Appointment::operator==(const Appointment& that) const
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index ecbee59..856f190 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -559,7 +559,7 @@ private:
if (a != nullptr)
{
- const DateTime alarm_begin{ai->occur_start};
+ const DateTime alarm_begin{ai->trigger};
auto& alarm = alarms[alarm_begin];
if (alarm.text.empty())
@@ -568,8 +568,6 @@ private:
alarm.audio_url = get_alarm_sound_url(a);
if (!alarm.time.is_set())
alarm.time = alarm_begin;
- if (alarm.duration == std::chrono::seconds::zero())
- alarm.duration = std::chrono::seconds(ai->occur_end - ai->occur_start);
e_cal_component_alarm_free(a);
}