Fix #1288

pydio · Nov 19, 2016 · b9ed5a7 · b9ed5a7
1 parent daa8e54
commit b9ed5a7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/plugins/action.scheduler/src/Scheduler.php b/core/src/plugins/action.scheduler/src/Scheduler.php
@@ -326,8 +326,11 @@ public function handleTasks(ServerRequestInterface $requestInterface, ResponseIn
                 $task = TaskService::getInstance()->getTaskById(InputFilter::sanitize($httpVars["task_id"], InputFilter::SANITIZE_ALPHANUM));
                 if($task !== null){
                     $children = $task->getChildrenTasks();
-                    if(!empty($children)){
-                        throw new PydioException("This task has currently jobs running, please wait that they are finished");
+                    foreach ($children as $child){
+                        if($child->getStatus() === Task::STATUS_RUNNING){
+                            throw new PydioException("This task has currently jobs running, please wait that they are finished");
+                        }
+                        TaskService::getInstance()->deleteTask($child->getId());
                     }
                     TaskService::getInstance()->deleteTask($task->getId());
                 }