gimp r27377 - in branches/gimp-2-6: . app/plug-in

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 23 17:14:22 2008
New Revision: 27377
URL: http://svn.gnome.org/viewvc/gimp?rev=27377&view=rev

Log:
2008-10-23  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	* app/plug-in/gimppluginprocframe.c
	(gimp_plug_in_proc_frame_dispose): set proc_frame->procedure to
	NULL *after* calling gimp_plug_in_cleanup(). Fixes the crash on
	windows in bug #557061 (but not the bug).



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/plug-in/gimppluginprocframe.c

Modified: branches/gimp-2-6/app/plug-in/gimppluginprocframe.c
==============================================================================
--- branches/gimp-2-6/app/plug-in/gimppluginprocframe.c	(original)
+++ branches/gimp-2-6/app/plug-in/gimppluginprocframe.c	Thu Oct 23 17:14:22 2008
@@ -118,12 +118,6 @@
       proc_frame->main_context = NULL;
     }
 
-  if (proc_frame->procedure)
-    {
-      g_object_unref (proc_frame->procedure);
-      proc_frame->procedure = NULL;
-    }
-
   if (proc_frame->return_vals)
     {
       g_value_array_free (proc_frame->return_vals);
@@ -138,6 +132,12 @@
 
   if (proc_frame->image_cleanups || proc_frame->item_cleanups)
     gimp_plug_in_cleanup (plug_in, proc_frame);
+
+  if (proc_frame->procedure)
+    {
+      g_object_unref (proc_frame->procedure);
+      proc_frame->procedure = NULL;
+    }
 }
 
 GimpPlugInProcFrame *