[gnome-photos/wip/rishi/misc-fixes: 20/20] application: Call gegl_exit later in the destruction sequence



commit 13a888c6aaab6d5d47e17b33d1ddb1c50cb839b7
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Dec 16 12:39:09 2015 +0100

    application: Call gegl_exit later in the destruction sequence
    
    Calling gegl_exit destroys the tile cache (through
    gegl_tile_cache_destroy). This leads to CRITICALs when we destroy the
    GeglTileHandlerCache objects afterwards. Therefore, we must call
    gegl_exit at the very end of the destruction sequence.

 src/photos-application.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index ecb5e5d..c8085c7 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -1147,7 +1147,6 @@ photos_application_shutdown (GApplication *application)
   g_assert (refresh_miner_ids_size == 0);
 
   g_clear_pointer (&priv->refresh_miner_ids, (GDestroyNotify) g_hash_table_unref);
-  gegl_exit ();
 
   G_APPLICATION_CLASS (photos_application_parent_class)->shutdown (application);
 }
@@ -1461,6 +1460,9 @@ photos_application_finalize (GObject *object)
 
   g_assert (self->priv->create_miners_count == 0);
 
+  if (!g_application_get_is_remote (G_APPLICATION (self)))
+    gegl_exit ();
+
   G_OBJECT_CLASS (photos_application_parent_class)->finalize (object);
 
   arena = egg_counter_arena_get_default ();


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