Don't crash when removing a row while editing it

YANOUSHek · Oct 11, 2011 · b7a7900 · b7a7900
1 parent aa32fab
commit b7a7900
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/TriggerController.m b/TriggerController.m
@@ -92,6 +92,8 @@ - (NSArray *)triggers
 
 - (void)setTrigger:(NSDictionary *)trigger forRow:(NSInteger)rowIndex
 {
+    // Stop editing. A reload while editing crashes.
+    [tableView_ reloadData];
     NSMutableArray *triggers = [[[self triggers] mutableCopy] autorelease];
     if (rowIndex < 0) {
         assert(trigger);
@@ -151,6 +153,10 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 - (id)tableView:(NSTableView *)aTableView
           objectValueForTableColumn:(NSTableColumn *)aTableColumn
             row:(NSInteger)rowIndex {
+    if (rowIndex >= [self numberOfRowsInTableView:aTableView]) {
+        // Sanity check.
+        return nil;
+    }
     NSDictionary *trigger = [[self triggers] objectAtIndex:rowIndex];
     if (aTableColumn == regexColumn_) {
         return [trigger objectForKey:kTriggerRegexKey];