* Test/System.Windows.Forms/ToolStripMenuItemTest.cs: Simplify test.

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms.CarbonInternal / WindowHandler.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
index d45aac52e176d5ae6aed3fdae097882b6bd4a82d..bfac5dd6bbdf77d15d2d6873fac0bdbef547a2a8 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/WindowHandler.cs
@@ -119,9 +119,9 @@ namespace System.Windows.Forms.CarbonInternal {
                                                Control c = Control.FromHandle (hwnd.client_window);
                                                if (c != null) {
                                                        Form form = c.FindForm ();
-                                                       if (form != null) {
+                                                       if (form != null && !form.IsDisposed) {
                                                                Driver.SendMessage (form.Handle, Msg.WM_ACTIVATE, (IntPtr) WindowActiveFlags.WA_ACTIVE, IntPtr.Zero);
-                                                               XplatUICarbon.ActiveWindow = window;
+                                                               XplatUICarbon.ActiveWindow = hwnd.client_window;
                                                        }
                                                }