felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-25 10:42:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle overlapping events better.

Browse Source
This commit is contained in:
Dianne Skoll
2020-02-22 16:30:08 -05:00
parent ad4e62c8c3
commit 6e58dea198
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dorem.c
+7 -1
View File
@@ -1102,10 +1102,16 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
iter = 0;
start = trig->scanfrom;
while (iter++ < MaxSatIter) {
jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1);
jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
if (r) {
if (r == E_CANT_TRIG) return OK; else return r;
}
if (jul != start && trig->duration_days) {
jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, trig->duration_days);
if (r) {
if (r == E_CANT_TRIG) return OK; else return r;
}
}
if (jul == -1) {
return E_EXPIRED;
}