Only force resign field editor as a last resort

alexzielenski · Apr 12, 2012 · a369f5c · a369f5c
1 parent 59bce74
commit a369f5c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ZKTextField.m b/src/ZKTextField.m
@@ -408,6 +408,8 @@ - (void)endEditing
 	if (self._currentFieldEditor) {		
 		self.attributedString = self._currentFieldEditor.attributedString;
 
+		[self.window endEditingFor:self];
+
 		[self._currentClipView removeFromSuperview];
 		self._currentClipView    = nil;
 		self._currentFieldEditor = nil;
@@ -441,8 +443,8 @@ - (void)mouseDown:(NSEvent *)event
 
 - (void)_configureFieldEditor
 {
-
-	[self.window endEditingFor:nil]; // Free the field editor
+	if (![self.window makeFirstResponder:self.window])
+		[self.window endEditingFor:nil]; // Free the field editor
 
 	NSTextView *fieldEditor = (NSTextView *)[self.window fieldEditor:YES
 														   forObject:self];