Merge pull request #955 from ermshiperete/bug-xamarin-10537

[MWF] Fix crash from null control in ContainerControl (#10537)
mono · Apr 7, 2014 · 6f677fd · 6f677fd
2 parents 3d469b9 + 18d7638
commit 6f677fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
@@ -322,7 +322,7 @@ private Control GetCommonContainer (Control active_control, Control value)
 
 		internal void SendControlFocus (Control c)
 		{
-			if (c.IsHandleCreated) {
+			if (c != null && c.IsHandleCreated) {
 				XplatUI.SetFocus (c.window.Handle);
 			}
 		}