Changeset 2269


Ignore:
Timestamp:
10/30/2010 9:17:29 AM (3 years ago)
Author:
lowjoel
Message:

Forward-port from Eraser 6.0: After r2267 where the Executor runs before the creation of the main window, we can no longer assume that the executor is not running when the controls are created. Always check and update the UI when starting.

Location:
trunk/eraser
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser

  • trunk/eraser/Eraser/MainForm.cs

    r1829 r2269  
    6262            Program.eraserClient.TaskDeleted += OnTaskDeleted; 
    6363 
     64            //Check if we have tasks running already. 
     65            foreach (Task task in Program.eraserClient.Tasks) 
     66                if (task.Executing) 
     67                { 
     68                    OnTaskProcessing(this, new TaskEventArgs(task)); 
     69                    break; 
     70                } 
     71 
    6472            //Check the notification area context menu's minimise to tray item. 
    6573            hideWhenMinimisedToolStripMenuItem.Checked = EraserSettings.Get().HideWhenMinimised; 

  • trunk/eraser/Eraser/SchedulerPanel.cs

    r2258 r2269  
    9898            if (task.Queued) 
    9999                item.SubItems[1].Text = S._("Queued for execution"); 
     100            else if (task.Executing) 
     101                task_TaskStarted(this, new TaskEventArgs(task)); 
    100102            else if (task.Schedule is RecurringSchedule) 
    101103                item.SubItems[1].Text = ((task.Schedule as RecurringSchedule).NextRun. 
Note: See TracChangeset for help on using the changeset viewer.