- s->deserialized_state == SERVICE_AUTO_RESTART)
- if ((r = unit_watch_timer(UNIT(s),
- s->deserialized_state == SERVICE_AUTO_RESTART ?
- s->restart_usec :
- s->timeout_usec,
- &s->timer_watch)) < 0)
- return r;
+ s->deserialized_state == SERVICE_AUTO_RESTART) {
+
+ if (s->deserialized_state == SERVICE_AUTO_RESTART || s->timeout_usec > 0) {
+ usec_t k;
+
+ k = s->deserialized_state == SERVICE_AUTO_RESTART ? s->restart_usec : s->timeout_usec;
+
+ if ((r = unit_watch_timer(UNIT(s), k, &s->timer_watch)) < 0)
+ return r;
+ }
+ }