core/job: shortening

Follow-up for a7a7163df7.
2018-05-20 23:25:04 +09:00
parent 0297f67e7a
commit 509ad7897c
1 changed files with 4 additions and 5 deletions
@@ -915,11 +915,10 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool alr
                j->manager->n_failed_jobs++;

        job_uninstall(j);
-        /* Remember jobs started before the reload */
-        if (MANAGER_IS_RELOADING(j->manager) && j->reloaded) {
-                if (job_save_pending_finished_job(j) < 0)
-                        job_free(j);
-        } else
+        /* Keep jobs started before the reload to send singal later, free all others */
+        if (!MANAGER_IS_RELOADING(j->manager) ||
+            !j->reloaded ||
+            job_save_pending_finished_job(j) < 0)
                job_free(j);

        /* Fail depending jobs on failure */