Skip to content

Fixes issue 4243: Ensure while loop in calendar module does not get stuck when no entries #4244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deBasMan21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes issue 4243: Ensure while loop in calendar module does not get stuck when no entries #4244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions defaultmodules/calendar/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,9 @@ Module.register("calendar", {
if (eventsByDate[dateStr] && eventsByDate[dateStr].length > 0) {
// If there are any events today then get all those events and select the currently active events and the events that are starting later in the day.
newEvents.push(...eventsByDate[dateStr].filter((ev) => this.timestampToMoment(ev.endDate).isAfter(moment())));
// Since we found a day with events, increase the daysCollected by 1
daysCollected++;
}
// Increment the daysCollected by one to ensure the while loop does not get stuck.
daysCollected++;
// Search for the next day
currentDate.add(1, "day");
}
Expand Down