[gnome-builder/gnome-builder-43] libide/foundry: be more defensive

[Christian Hergert <chergert src gnome org>]

commit 601b6eaac1a9eef8cac8c49883141b21f89bf0ad
Author: Christian Hergert <chergert redhat com>
Date:   Wed Sep 21 15:14:37 2022 -0700

    libide/foundry: be more defensive
    
    It's nice to keep the object around across the signal callbacks.

 src/libide/foundry/ide-pipeline.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/src/libide/foundry/ide-pipeline.c b/src/libide/foundry/ide-pipeline.c
index 0d8f3a03f..f82e3e015 100644
--- a/src/libide/foundry/ide-pipeline.c
+++ b/src/libide/foundry/ide-pipeline.c
@@ -2066,11 +2066,11 @@ ide_pipeline_tick_build (IdePipeline *self,
           ide_pipeline_try_chain (self, entry->stage, self->position + 1);
 
           _ide_pipeline_stage_build_with_query_async (entry->stage,
-                                                     self,
-                                                     targets,
-                                                     cancellable,
-                                                     ide_pipeline_stage_build_cb,
-                                                     g_object_ref (task));
+                                                      self,
+                                                      targets,
+                                                      cancellable,
+                                                      ide_pipeline_stage_build_cb,
+                                                      g_object_ref (task));
 
           g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_MESSAGE]);
           g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_PHASE]);
@@ -2881,9 +2881,15 @@ ide_pipeline_detach (IdePipeline *self,
 
       if (entry->id == stage_id)
         {
-          ide_object_destroy (IDE_OBJECT (entry->stage));
+          g_autoptr(IdePipelineStage) stage = g_object_ref (entry->stage);
+
+          /* Remove index and notify listmodel observers */
           g_array_remove_index (self->pipeline, i);
           g_list_model_items_changed (G_LIST_MODEL (self), i, 1, 0);
+
+          /* Wait until after notifying listmodel observers */
+          ide_object_destroy (IDE_OBJECT (stage));
+
           break;
         }
     }