Merge remote-tracking branch 'upstream/master' into CPImageView-bindings

cappuccino · Apr 12, 2012 · 0c8715d · 0c8715d
2 parents 487d38f + c028c0a
commit 0c8715d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
@@ -3369,6 +3369,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_commitDataViewObjectValue:(id)sender
 {
+    /*
+        makeFirstResponder at the end of this method causes the dataview to resign.
+        If the dataview resigning triggers the action (as CPTextField does), we come right
+        back here and start an infinite loop. So we have to check this flag first.
+    */
+    if (_editingCellIndex === nil)
+        return;
+
     _editingCellIndex = nil;
 
     if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_setObjectValue_forTableColumn_row_)