From 17d5510c03222d2b20132011a9b1d92554c9c570 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Wed, 13 Jan 2010 13:56:38 +0000 Subject: [PATCH] Fix crash when pressing deadkey while CC window is open. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5397 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../CodeCompletion/CompletionWindowBase.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindowBase.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindowBase.cs index 23f90ee257..67f8c03a78 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindowBase.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindowBase.cs @@ -126,12 +126,17 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion public override void OnPreviewKeyDown(KeyEventArgs e) { + // prevents crash when typing deadchar while CC window is open + if (e.DeadCharProcessedKey != Key.None) + return; e.Handled = RaiseEventPair(window, PreviewKeyDownEvent, KeyDownEvent, new KeyEventArgs(e.KeyboardDevice, e.InputSource, e.Timestamp, e.Key)); } public override void OnPreviewKeyUp(KeyEventArgs e) { + if (e.DeadCharProcessedKey != Key.None) + return; e.Handled = RaiseEventPair(window, PreviewKeyUpEvent, KeyUpEvent, new KeyEventArgs(e.KeyboardDevice, e.InputSource, e.Timestamp, e.Key)); }