From f83af4d8af0c9069ef91f9c4337a49c42d02b4bd Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Fri, 12 Oct 2012 15:57:17 +0200
Subject: [PATCH] AvalonEdit IME Support: clear old context when IME support is
 disabled

---
 .../AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
index 7ac241efb6..fd137c112d 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/ImeSupport.cs
@@ -71,8 +71,6 @@ namespace ICSharpCode.AvalonEdit.Editing
 		
 		void TextAreaGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
 		{
-			if (this.textArea == null)
-				return;
 			if (e.OriginalSource != this.textArea)
 				return;
 			CreateContext();
@@ -80,8 +78,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 
 		void CreateContext()
 		{
-			if (this.textArea == null)
-				return;
+			ClearContext(); // clear old context if necessary
 			if (!textArea.Options.EnableImeSupport)
 				return;
 			hwndSource = (HwndSource)PresentationSource.FromVisual(this.textArea);