1 files changed, 57 insertions, 30 deletions

diff --git a/src/comp.c b/src/comp.c
index c3e998a..2346306 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -26,2 +26,7 @@ struct complist
 
+/* 0 on the first load, and 1 on all subsequent reloads. Tells the
+   component_config_commit whether we're starting from scratch or just
+   updating an already loaded configuration */
+static int loaded;
+
 static struct complist comp_list[2];
@@ -34,3 +39,3 @@ static pies_depmap_t depmap;
 
-static int
+static inline int
 next_index (void)
@@ -40,3 +45,3 @@ next_index (void)
 
-static int
+static inline int
 prev_index (void)
@@ -87,2 +92,18 @@ component_append (struct component *comp)
 void
+comp_array_remove (size_t i)
+{
+  struct component *comp = comp_array[i];
+
+  depmap_remove (depmap, i);
+  while (i < comp_count -1)
+    {
+      comp_array[i] = comp_array[i+1];
+      comp_array[i]->arridx = i;
+      i++;
+    }
+  component_free (comp);
+  comp_count--;
+}
+
+void
 component_unlink (struct component *comp)
@@ -203,3 +224,8 @@ component_ref_decr (struct component *comp)
   if (--comp->ref_count == 0)
-    component_free (comp);
+    {
+      if (component_is_active (comp))
+        comp_array_remove (comp->arridx);
+      else
+        component_free (comp);
+    }
 }
@@ -427,13 +453,2 @@ report_cyclic_dependency (pies_depmap_t dp, size_t idx)
 void
-comp_array_remove (size_t i)
-{
-  struct component *comp = comp_array[i];
-  if (i < comp_count - 1)
-    memmove (&comp_array[i], &comp_array[i+1],
-             (comp_count - i - 1) * sizeof comp_array[0]);
-  component_free (comp);
-  comp_count--;
-}
-
-void
 component_build_depmap (void)
@@ -462,3 +477,2 @@ component_build_depmap (void)
                 comp_array_remove (i);
-                depmap_remove (depmap, i);
                 continue;
@@ -499,6 +513,3 @@ component_build_depmap (void)
     if (comp_array[i]->flags & CF_REMOVE)
-      {
-        comp_array_remove (i);
-        depmap_remove (depmap, i);
-      }
+      comp_array_remove (i);
     else
@@ -530,18 +541,32 @@ component_config_commit (void)
 
-  /* Rearrange components, registering prog entries for the new ones */
-  for (comp = list->head, i = 0; comp; comp = comp->next, i++)
+  /* Rearrange components, registering entries for the new ones */
+  for (comp = list->head, i = 0; comp; )
     {
-      match = complist_find_match (prev, comp);
-      if (match)
+      struct component *next = comp->next;
+      if (loaded && comp->mode == pies_comp_startup)
         {
-          component_merge (match, comp);
-          component_unlink (match);
-          match->listidx = cur;
-          component_link (match, comp->prev);
+          /* Ignore startup components */
+          component_unlink (comp);
           component_free (comp);
-          comp = match;
         }
-      comp_array[i] = comp;
-      comp->arridx = i;
+      else
+        {
+          match = complist_find_match (prev, comp);
+          if (match)
+            {
+              component_merge (match, comp);
+              component_unlink (match);
+              match->listidx = cur;
+              component_link (match, comp->prev);
+              component_free (comp);
+              comp = match;
+            }
+          comp_array[i] = comp;
+          comp->arridx = i;
+          i++;
+        }
+      comp = next;
     }
+  /* Adjust comp_count */
+  comp_count = i;
 
@@ -562,2 +587,4 @@ component_config_commit (void)
       register_prog (comp);
+
+  loaded = 1;
 }