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
@@ -325,5 +325,6 @@ progman_startup_phase (void)
   for (prog = proghead; prog; prog = prog->next)
     {
-      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;
     }
@@ -339,5 +340,5 @@ 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))
         {
@@ -2357,12 +2358,4 @@ progman_cleanup (int expect_term)
               destroy_prog (&prog);
             }
-          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
             {
@@ -2380,4 +2373,10 @@ 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
                 {