merge commit

This commit is contained in:
robvde 2013-03-04 18:36:15 +04:00
commit e3901f2440
7 changed files with 598 additions and 454 deletions

View file

@ -162,7 +162,7 @@ namespace WebsitePanel.EnterpriseServer
counter++;
}
{
// skip execution if the current task is still running
scheduledTasks = TaskManager.GetScheduledTasks();
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))