Merge pull request #95 from FlorisBriolas/combo-WindowsFormsHost-issue

* repair nullref combobox combined with focus on winforms control
fluentribbon · Apr 11, 2015 · b49f36f · b49f36f
2 parents e3c12c5 + b42c52e
commit b49f36f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Fluent/Controls/ComboBox.cs b/Fluent/Controls/ComboBox.cs
@@ -647,7 +647,7 @@ protected override void OnDropDownOpened(EventArgs e)
             Mouse.Capture(this, CaptureMode.SubTree);
             if (SelectedItem != null) Keyboard.Focus(ItemContainerGenerator.ContainerFromItem(SelectedItem) as IInputElement);
             focusedElement = Keyboard.FocusedElement;
-            focusedElement.LostKeyboardFocus += OnFocusedElementLostKeyboardFocus;
+            if (focusedElement!=null) focusedElement.LostKeyboardFocus += OnFocusedElementLostKeyboardFocus;
 
             canSizeY = true;