Changeset 1736

Timestamp:

2/3/2010 12:29:46 AM (2 years ago)

Author:

lowjoel

Message:

Forward port from Eraser 6.0: Fixed potential regression in r1721 and r1633 where we added in calls to CreateHandle? so that window handles are created immediately for calls to InvokeRequired?. Check that IsHandleCreated? is false so that the handle will not be recreated and throw an InvalidOperationException?

Location:

trunk/eraser6

Files:

• . (modified) (1 prop)
• Eraser/MainForm.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (1 diff)

trunk/eraser6/Eraser/MainForm.cs

@@ -48 +48 @@
             contentPanel.Controls.Add(SchedulerPage);
             contentPanel.Controls.Add(SettingsPage);
-            CreateHandle();
+            if (!IsHandleCreated)
+                CreateHandle();
 
             UXThemeApi.UpdateControlTheme(this);

trunk/eraser6/Eraser/SchedulerPanel.cs

@@ -45 +45 @@
             InitializeComponent();
             UXThemeApi.UpdateControlTheme(schedulerDefaultMenu);
-            CreateHandle();
+            if (!IsHandleCreated)
+                CreateHandle();
 
             //Populate the scheduler list-view with the current task list