From 2e63f132705ba2ead97f3b651bea233c01b2122d Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 18 Oct 2009 17:21:51 +0000 Subject: [PATCH] Fixed unhandled InvalidCastException when using the keyboard with a Form being displayed in the designer. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5080 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../FormsDesigner/Project/Src/FormKeyHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs index 5b1b52e40b..d6713ab113 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs @@ -76,8 +76,9 @@ namespace ICSharpCode.FormsDesigner if (formDesigner == null || formDesigner.Host == null) { return false; } - if (!((Control)formDesigner.Control).ContainsFocus) + if (formDesigner.UserContent != null && !((Control)formDesigner.UserContent).ContainsFocus) { return false; + } Control originControl = Control.FromChildHandle(m.HWnd); if (originControl != null && formDesigner.UserContent != null && !(formDesigner.UserContent == originControl || formDesigner.UserContent.Contains(originControl))) {