diff --git a/MeetingBar/ActionsOnEventStart.swift b/MeetingBar/ActionsOnEventStart.swift index 6c626804..cba549df 100644 --- a/MeetingBar/ActionsOnEventStart.swift +++ b/MeetingBar/ActionsOnEventStart.swift @@ -43,7 +43,7 @@ class ActionsOnEventStart: NSObject { } // - if let nextEvent = getNextEvent(events: app.statusBarItem.events) { + if let nextEvent = getNextEvent(events: app.statusBarItem.events, linkRequired: true) { let now = Date() let startEndRange = nextEvent.startDate ... nextEvent.endDate diff --git a/MeetingBar/EventStores/Event.swift b/MeetingBar/EventStores/Event.swift index 0fb52031..db5cd899 100644 --- a/MeetingBar/EventStores/Event.swift +++ b/MeetingBar/EventStores/Event.swift @@ -222,7 +222,7 @@ func filterEvents(_ events: [MBEvent]) -> [MBEvent] { return filteredCalendarEvents } -func getNextEvent(events: [MBEvent]) -> MBEvent? { +func getNextEvent(events: [MBEvent], linkRequired: Bool = false) -> MBEvent? { var nextEvent: MBEvent? let now = Date() @@ -257,7 +257,8 @@ func getNextEvent(events: [MBEvent]) -> MBEvent? { } // Skip event if events without links should be skipped - if event.meetingLink == nil && (Defaults[.nonAllDayEvents] == .show_inactive_without_meeting_link || Defaults[.nonAllDayEvents] == .hide_without_meeting_link) { + let nonAllDaysEventOnlyWithLink = (Defaults[.nonAllDayEvents] == .show_inactive_without_meeting_link || Defaults[.nonAllDayEvents] == .hide_without_meeting_link) + if event.meetingLink == nil, (linkRequired || nonAllDaysEventOnlyWithLink) { continue }