[gnome-builder] flatpak: be a bit more defensive



commit 38c238aff2f01aa87c9cba626ee90ac0e57b65a5
Author: Christian Hergert <chergert redhat com>
Date:   Wed May 29 18:17:08 2019 -0700

    flatpak: be a bit more defensive

 src/plugins/flatpak/gbp-flatpak-config-provider.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-config-provider.c 
b/src/plugins/flatpak/gbp-flatpak-config-provider.c
index fb70087cb..6a489a370 100644
--- a/src/plugins/flatpak/gbp-flatpak-config-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-config-provider.c
@@ -406,16 +406,20 @@ contains_file (GbpFlatpakConfigProvider *self,
 
 static void
 gbp_flatpak_config_provider_monitor_changed (GbpFlatpakConfigProvider *self,
-                                                    GFile                           *file,
-                                                    GFile                           *other_file,
-                                                    GFileMonitorEvent                event,
-                                                    IdeVcsMonitor                   *monitor)
+                                             GFile                    *file,
+                                             GFile                    *other_file,
+                                             GFileMonitorEvent         event,
+                                             IdeVcsMonitor            *monitor)
 {
   g_assert (GBP_IS_FLATPAK_CONFIG_PROVIDER (self));
   g_assert (G_IS_FILE (file));
   g_assert (!other_file || G_IS_FILE (other_file));
   g_assert (IDE_IS_VCS_MONITOR (monitor));
 
+  if (ide_object_in_destruction (IDE_OBJECT (self)) ||
+      ide_object_in_destruction (IDE_OBJECT (monitor)))
+    return;
+
   if (event == G_FILE_MONITOR_EVENT_CREATED)
     {
       g_autofree gchar *name = g_file_get_basename (file);
@@ -607,7 +611,7 @@ gbp_flatpak_config_provider_unload (IdeConfigProvider *provider)
 
 static void
 gbp_flatpak_config_provider_duplicate (IdeConfigProvider *provider,
-                                              IdeConfig         *configuration)
+                                       IdeConfig         *configuration)
 {
   GbpFlatpakManifest *manifest = (GbpFlatpakManifest *)configuration;
   g_autofree gchar *path = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]