diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m index fe19291ab..3a6559b76 100644 --- a/platform/ios/MGLMapboxEvents.m +++ b/platform/ios/MGLMapboxEvents.m @@ -408,20 +408,11 @@ NSString *const MGLEventGestureRotateStart = @"Rotation"; __block NSArray *events; - NSUInteger upper = strongSelf.flushAt; - if (strongSelf.flushAt > [_eventQueue count]) { - if ([_eventQueue count] == 0) { - return; - } - upper = [_eventQueue count]; - } - - // Create Array of Events to push to the Server - NSRange theRange = NSMakeRange(0, upper); - events = [_eventQueue subarrayWithRange:theRange]; - + // Make an immutable copy + events = [NSArray arrayWithArray:_eventQueue]; + // Update Queue to remove events sent to server - [_eventQueue removeObjectsInRange:theRange]; + [_eventQueue removeAllObjects]; // Send Array of Events to Server [strongSelf postEvents:events];