LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for bug #1571.

maint-2.0.2
root 2012-09-19 10:54:57 -04:00
parent 9b3e4c8ab8
commit dbb9bac38c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
UI/Scheduler/UIxCalListingActions.m
View File

@ -668,7 +668,7 @@ _userStateInEvent (NSArray *event)
withNumber: (NSNumber *) number
{
int currentDayStart, startSecs, endsSecs, currentStart, eventStart,
eventEnd, offset, recurrenceTime, swap;
eventEnd, computedEventEnd, offset, recurrenceTime, swap;
NSMutableArray *currentDay;
NSMutableDictionary *eventBlock;
iCalPersonPartStat userState;
@ -738,19 +738,21 @@ _userStateInEvent (NSArray *event)
offset++;
currentDay = [blocks objectAtIndex: offset];
}
if (eventEnd > currentStart)
{
eventBlock = [self _eventBlockWithStart: currentStart
end: eventEnd
number: number
onDay: currentDayStart
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
}
else
[self warnWithFormat: @"event '%@' has end <= start: %d < %d",
[event objectAtIndex: eventNameIndex], eventEnd, currentStart];
computedEventEnd = eventEnd;
// We add 5 mins to the end date of an event if the end date
// is equal or smaller than the event's start date.
if (eventEnd <= currentStart)
computedEventEnd += (5*60);
eventBlock = [self _eventBlockWithStart: currentStart
end: computedEventEnd
number: number
onDay: currentDayStart
recurrenceTime: recurrenceTime
userState: userState];
[currentDay addObject: eventBlock];
}
}
}