From 2b6428efd084f7b09833cd7b854a737feb9f0f2d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 24 Feb 2014 07:55:21 -0500 Subject: [PATCH] Always check resource conflict for new events Fixes #2541 --- SoObjects/Appointments/SOGoAppointmentObject.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index c2dc463e3..8fa6a1174 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -813,13 +813,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent { // New event -- send invitation to all attendees attendees = [newEvent attendeesWithoutUser: ownerUser]; + + // We catch conflicts and abort the save process immediately + // in case of one with resources + if ((ex = [self _handleAddedUsers: attendees fromEvent: newEvent])) + return ex; + if ([attendees count]) { - // We catch conflicts and abort the save process immediately - // in case of one with resources - if ((ex = [self _handleAddedUsers: attendees fromEvent: newEvent])) - return ex; - [self sendEMailUsingTemplateNamed: @"Invitation" forObject: [newEvent itipEntryWithMethod: @"request"] previousObject: nil