From 2fb7433b583d6b003336a46698f0be261f4bd475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 23 Jul 2015 09:03:36 +0200 Subject: [PATCH] launch_daemon: Fixed Alexander's logic mixup. * The warning in GCC 4 is just that, a warning. It doesn't mean the previous version was wrong :-) --- src/servers/launch/LaunchDaemon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/servers/launch/LaunchDaemon.cpp b/src/servers/launch/LaunchDaemon.cpp index 7bb4e1823d..eb67e3e46f 100644 --- a/src/servers/launch/LaunchDaemon.cpp +++ b/src/servers/launch/LaunchDaemon.cpp @@ -1011,9 +1011,9 @@ LaunchDaemon::_LaunchJobs(Target* target, bool forceNow) void LaunchDaemon::_LaunchJob(Job* job, bool forceNow) { - if ((job == NULL || job->IsLaunched() || !forceNow) + if (job == NULL || job->IsLaunched() || (!forceNow && (!job->EventHasTriggered() || !job->CheckCondition(*this) - || Events::TriggerDemand(job->Event()))) { + || Events::TriggerDemand(job->Event())))) { return; }