Changeset 2543 for trunk/eraser

Timestamp:

3/19/2012 2:09:11 AM (14 months ago)

Author:

lowjoel

Message:

Tasks were not being cleared from the task list upon successful completion because they were reset to Manually executed tasks before returning to the Executor. This scheduling ability should be dealt with in the Executor and not the Task. Therefore, the Task Completion event will still have the schedule of the initial configuration, and not after the schedule has been reset to Manual. This allows context menu tasks which completed successfully to be cleared automatically.

Fixes bug in ​https://eraser.heidi.ie/forum/viewtopic.php?f=36&p=25922#p25922.

Location:

trunk/eraser/Eraser.Manager

Files:

• DirectExecutor.cs (modified) (1 diff)
• Task.cs (modified) (1 diff)

trunk/eraser/Eraser.Manager/DirectExecutor.cs

@@ -281 +281 @@
                         //time since we are done with this one.
                         if (task.Schedule is RecurringSchedule)
+                        {
                             ScheduleTask(task);
+                        }
+
+                        //If the task is an execute on restart task or run immediately task, it is
+                        //only run once and can now be restored to a manually run task
+                        else if (task.Schedule == Schedule.RunOnRestart ||
+                            task.Schedule == Schedule.RunNow)
+                        {
+                            task.Schedule = Schedule.RunManually;
+                        }
 
                         //Remove the actively executing task from our instance variable

trunk/eraser/Eraser.Manager/Task.cs

@@ -295 +295 @@
                 }
 
-                //If the task is an execute on restart task or run immediately task, it is
-                //only run once and can now be restored to a manually run task
-                if (Schedule == Schedule.RunOnRestart || Schedule == Schedule.RunNow)
-                    Schedule = Schedule.RunManually;
-
                 Progress = null;
                 Executing = false;