From 7236ce6e9e379948217c31f38b48de6448521162 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 8 Apr 2016 21:09:17 -0400 Subject: [PATCH] core/service: only search for pid if loading from file failed CID #1237511. --- src/core/service.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index 8f59c411b8b..c5cbf0f1529 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2751,10 +2751,9 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { break; case SERVICE_RELOAD: - if (f == SERVICE_SUCCESS) { - service_load_pid_file(s, true); - service_search_main_pid(s); - } + if (f == SERVICE_SUCCESS) + if (service_load_pid_file(s, true) < 0) + service_search_main_pid(s); s->reload_result = f; service_enter_running(s, SERVICE_SUCCESS); -- 2.47.3