From a369f5c8c97d39cdf2a5750985864b948bb1020a Mon Sep 17 00:00:00 2001
From: Alex Zielenski <alex@zielenski.net>
Date: Thu, 12 Apr 2012 15:54:26 -0400
Subject: [PATCH] Only force resign field editor as a last resort

---
 src/ZKTextField.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ZKTextField.m b/src/ZKTextField.m
index 6426978..eeeaead 100644
--- 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];