gimp r27347 - in branches/gimp-2-6: . app/actions

[neo svn gnome org]

Author: neo
Date: Tue Oct 21 07:52:15 2008
New Revision: 27347
URL: http://svn.gnome.org/viewvc/gimp?rev=27347&view=rev

Log:
2008-10-21  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* app/actions/file-commands.c (file_open_recent_cmd_callback): 
ref
	the GimpDisplay and GimpImageFile objects while holding a
	reference to them. Fixes a potential crash if GIMP is closed 
while
	the image is being loaded.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/actions/file-commands.c

Modified: branches/gimp-2-6/app/actions/file-commands.c
==============================================================================
--- branches/gimp-2-6/app/actions/file-commands.c	(original)
+++ branches/gimp-2-6/app/actions/file-commands.c	Tue Oct 21 07:52:15 2008
@@ -165,6 +165,9 @@
       GError            *error = NULL;
       return_if_no_display (display, data);
 
+      g_object_ref (display);
+      g_object_ref (imagefile);
+
       progress = display->image ? NULL : GIMP_PROGRESS (display);
 
       image = file_open_with_display (gimp, action_data_get_context (data),
@@ -184,6 +187,9 @@
 
           g_free (filename);
         }
+
+      g_object_unref (imagefile);
+      g_object_unref (display);
     }
 }