From 91175fbc9e9fc394c9e6631ecf09b1cee8ccfa42 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Fri, 15 Jun 2018 17:31:35 +0100 Subject: [PATCH] Avoid another unnecessary issue-stop-on-release. --- src/service.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/service.cc b/src/service.cc index 2021d4f..597683e 100644 --- a/src/service.cc +++ b/src/service.cc @@ -481,8 +481,8 @@ void service_record::do_stop() noexcept // we need to delegate to can_interrupt_start() (which can be overridden). if (! waiting_for_deps && ! waiting_for_console) { if (! can_interrupt_start()) { - // Well this is awkward: we're going to have to continue starting. We can stop once we've - // reached the started state. + // Well this is awkward: we're going to have to continue starting. We can stop once + // we've reached the started state. return; } @@ -563,7 +563,9 @@ bool service_record::stop_dependents() noexcept } if (dept->holding_acq) { dept->holding_acq = false; - release(); + // release without issuing stop, since we should be called only when this + // service is already stopped/stopping: + release(false); } } } -- 2.25.1