1 files changed, 9 insertions, 10 deletions

diff --git a/src/progman.c b/src/progman.c
index 5bc4eb3..a625885 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -326,3 +326,4 @@ progman_startup_phase (void)
     {
-      if (IS_COMPONENT (prog) && prog->v.p.comp->mode == pies_comp_startup)
+      if (IS_COMPONENT (prog) && prog->v.p.comp->mode == pies_comp_startup
+          && prog->v.p.status == status_running)
         return 1;
@@ -340,3 +341,3 @@ progman_waiting_p (void)
       if (IS_COMPONENT (prog)
-          && prog->pid > 0
+          && prog->v.p.status == status_running
           && (prog->wait || prog->v.p.comp->mode == pies_comp_startup))
@@ -2358,10 +2359,2 @@ progman_cleanup (int expect_term)
             }
-          else if (prog->v.p.comp->mode == pies_comp_startup)
-            {
-              debug (1, (_("removing startup component %s, pid=%lu"),
-                         prog_tag (prog), (unsigned long)pid));
-              destroy_prog (&prog);
-              if (!progman_startup_phase ())
-                pies_schedule_children (PIES_CHLD_WAKEUP);
-            }
           else
@@ -2381,2 +2374,8 @@ progman_cleanup (int expect_term)
                 }
+              else if (prog->v.p.comp->mode == pies_comp_startup)
+                {
+                  prog->v.p.status = status_finished;
+                  if (!progman_startup_phase ())
+                    pies_schedule_children (PIES_CHLD_WAKEUP);
+                }
               else