[gimp/gimp-2-8] Bug 731389 - gimp-edit-copy causes assertion failure on exit



commit 60db2dc41cb714452cda853327f801877ff2c9a4
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 10 01:35:30 2014 +0200

    Bug 731389 - gimp-edit-copy causes assertion failure on exit
    
    Shutdown the clipboard earlier at exit, it runs quite some code on
    storing the copied buffer.
    
    (cherry picked from commit 8aa6ff9608aa497c1b394dace50c99216b1cd995)

 app/gui/gui.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 3f65546..0dfb5ec 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -650,6 +650,14 @@ gui_exit_after_callback (Gimp     *gimp,
   g_object_unref (ui_configurer);
   ui_configurer = NULL;
 
+  /*  exit the clipboard before shutting down the GUI because it runs
+   *  a whole lot of code paths. See bug #731389.
+   */
+  g_signal_handlers_disconnect_by_func (gimp,
+                                        G_CALLBACK (gui_global_buffer_changed),
+                                        NULL);
+  gimp_clipboard_exit (gimp);
+
   session_exit (gimp);
   menus_exit (gimp);
   actions_exit (gimp);
@@ -658,12 +666,6 @@ gui_exit_after_callback (Gimp     *gimp,
   gimp_controllers_exit (gimp);
   gimp_devices_exit (gimp);
   dialogs_exit (gimp);
-
-  g_signal_handlers_disconnect_by_func (gimp,
-                                        G_CALLBACK (gui_global_buffer_changed),
-                                        NULL);
-  gimp_clipboard_exit (gimp);
-
   themes_exit (gimp);
 
   g_type_class_unref (g_type_class_peek (GIMP_TYPE_COLOR_SELECT));


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