Index: branches/eraser6/CodeReview/Eraser/SchedulerPanel.cs
===================================================================
--- branches/eraser6/CodeReview/Eraser/SchedulerPanel.cs	(revision 1701)
+++ branches/eraser6/CodeReview/Eraser/SchedulerPanel.cs	(revision 1745)
@@ -45,5 +45,6 @@
 			InitializeComponent();
 			Theming.ApplyTheme(schedulerDefaultMenu);
-			CreateHandle();
+			if (!IsHandleCreated)
+				CreateHandle();
 
 			//Populate the scheduler list-view with the current task list
@@ -187,5 +188,5 @@
 		void task_TaskStarted(object sender, TaskEventArgs e)
 		{
-			if (scheduler.InvokeRequired)
+			if (InvokeRequired)
 			{
 				Invoke((EventHandler<TaskEventArgs>)task_TaskStarted, sender, e);
@@ -213,5 +214,5 @@
 			//Make sure we handle the event in the main thread as this requires
 			//GUI calls.
-			if (scheduler.InvokeRequired)
+			if (InvokeRequired)
 			{
 				Invoke((EventHandler<ProgressChangedEventArgs>)task_ProgressChanged, sender, e);