aboutsummaryrefslogtreecommitdiff
path: root/src/progman.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/progman.c')
-rw-r--r--src/progman.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/progman.c b/src/progman.c
index 4f63d9a..3bbd8b3 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -2362,7 +2362,9 @@ progman_stop_component (struct prog *prog)
break;
case status_disabled:
- if (!(prog->v.p.comp->flags & CF_DISABLED))
+ if (!component_is_active (prog->v.p.comp))
+ destroy_prog (&prog);
+ else if (!(prog->v.p.comp->flags & CF_DISABLED))
{
logmsg (LOG_INFO, _("enabling component `%s'"), prog_tag (prog));
prog->v.p.status = status_enabled;
@@ -2370,14 +2372,22 @@ progman_stop_component (struct prog *prog)
break;
case status_sleeping:
- logmsg (LOG_INFO, _("waking up component `%s'"), prog_tag (prog));
- prog->v.p.failcount = 0;
+ if (!component_is_active (prog->v.p.comp))
+ destroy_prog (&prog);
+ else
+ {
+ logmsg (LOG_INFO, _("waking up component `%s'"), prog_tag (prog));
+ prog->v.p.failcount = 0;
+ }
break;
default:
- logmsg (LOG_INFO,
- _("stopping component `%s': component not started"),
- prog_tag (prog));
+ if (!component_is_active (prog->v.p.comp))
+ destroy_prog (&prog);
+ else
+ logmsg (LOG_INFO,
+ _("stopping component `%s': component not started"),
+ prog_tag (prog));
}
}
}

Return to:

Send suggestions and report system problems to the System administrator.