Correctly handle start timeout of 0 (i.e. no timeout).

diff --git a/src/service.cc b/src/service.cc
index ce2ec5d74fb68615de421d2393aa399dfab0ee72..bed9f2e0171f36a1db40f6b5a1ee554d34d3b4d2 100644 (file)
--- a/src/service.cc
+++ b/src/service.cc
@@ -902,8 +902,14 @@ bool base_process_service::bring_up() noexcept
         eventLoop.get_time(restart_interval_time, clock_type::MONOTONIC);
         restart_interval_count = 0;
         if (start_ps_process(exec_arg_parts, onstart_flags.starts_on_console)) {
-            restart_timer.arm_timer_rel(eventLoop, start_timeout);
-            stop_timer_armed = true;
+            if (start_timeout != time_val(0,0)) {
+                restart_timer.arm_timer_rel(eventLoop, start_timeout);
+                stop_timer_armed = true;
+            }
+            else if (stop_timer_armed) {
+                restart_timer.stop_timer(eventLoop);
+                stop_timer_armed = false;
+            }
             return true;
         }
         return false;