dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set proc_frame->procedure to NULL *after* calling gimp_plug_in_cleanup(). 

2008-10-23  Michael Natterer  <mitch@gimp.org>

	* 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).


svn path=/trunk/; revision=27376
This commit is contained in:
Michael Natterer 2008-10-23 17:13:19 +00:00 committed by Michael Natterer
parent 3b053f79fa
commit d3d9724ee1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-23 Michael Natterer <mitch@gimp.org>
* 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).
2008-10-23 Michael Natterer <mitch@gimp.org> 2008-10-23 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.h: don't #include * app/display/gimpdisplayshell.h: don't #include

12
app/plug-in/gimppluginprocframe.c
View File

@ -118,12 +118,6 @@ gimp_plug_in_proc_frame_dispose (GimpPlugInProcFrame *proc_frame,
proc_frame->main_context = NULL; proc_frame->main_context = NULL;
} }
if (proc_frame->procedure)
{
g_object_unref (proc_frame->procedure);
proc_frame->procedure = NULL;
}
if (proc_frame->return_vals) if (proc_frame->return_vals)
{ {
g_value_array_free (proc_frame->return_vals); g_value_array_free (proc_frame->return_vals);
@ -138,6 +132,12 @@ gimp_plug_in_proc_frame_dispose (GimpPlugInProcFrame *proc_frame,
if (proc_frame->image_cleanups || proc_frame->item_cleanups) if (proc_frame->image_cleanups || proc_frame->item_cleanups)
gimp_plug_in_cleanup (plug_in, proc_frame); gimp_plug_in_cleanup (plug_in, proc_frame);
if (proc_frame->procedure)
{
g_object_unref (proc_frame->procedure);
proc_frame->procedure = NULL;
}
} }
GimpPlugInProcFrame * GimpPlugInProcFrame *