Skip to content

Commit ff6f4bc

Browse files
committed
fix update all children and reorder remove event method
1 parent e7c98d3 commit ff6f4bc

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

pkg/core/core_events.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,16 @@ func (c *Core) RemoveEvent(event Event) error {
153153
}
154154

155155
// delete file from disk + git
156-
err = c.deleteAndCommitEvent(event.Id, fmt.Sprintf("Deleted event %q", event.Id))
156+
err := c.deleteAndCommitEvent(event.Id, fmt.Sprintf("Deleted event %q", event.Id))
157157
if err != nil {
158158
return fmt.Errorf("failed to delete event from git: %w", err)
159159
}
160160

161+
err = c.intervalTree.RemoveEvent(event)
162+
if err != nil {
163+
return fmt.Errorf("failed to delete event from interval tree: %w", err)
164+
}
165+
161166
delete(c.events, event.Id)
162167
return nil
163168
}
@@ -441,8 +446,8 @@ func (c *Core) updateAllChildren(old, new *Event) (*Event, error) {
441446
repeat := *new.Repeat
442447
repeat.Exceptions = exceptions
443448
parent.Repeat = &repeat
444-
} else {
445-
parent.Repeat = nil
449+
} else if parent.Repeat != nil {
450+
parent.Repeat.Exceptions = exceptions
446451
}
447452

448453
parent.Title = new.Title

0 commit comments

Comments
 (0)