nautilus r15091 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Mar 12 12:23:00 2009
New Revision: 15091
URL: http://svn.gnome.org/viewvc/nautilus?rev=15091&view=rev

Log:
2009-03-12  Alexander Larsson  <alexl redhat com>

	Bug 538888 â crash in Home Folder: I tried to open a direct...

	* libnautilus-private/nautilus-thumbnails.c:
	(get_pixbuf_from_data):
	Don't crash when gdk-pixbuf returns an error but doesn't
	set the GError properly.




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-thumbnails.c

Modified: trunk/libnautilus-private/nautilus-thumbnails.c
==============================================================================
--- trunk/libnautilus-private/nautilus-thumbnails.c	(original)
+++ trunk/libnautilus-private/nautilus-thumbnails.c	Thu Mar 12 12:23:00 2009
@@ -460,7 +460,12 @@
 	if (!gdk_pixbuf_loader_close (loader, &error) ||
 	    /* Seems we have to check this even if it returned TRUE (#403255) */
 	    error != NULL) {
-		g_message ("Failed to close thumbnail pixbuf loader for %s: %s", path, error->message);
+		/* In some cases, we don't get an error even with FALSE returns (#538888) */
+		if (error != NULL) {
+			g_message ("Failed to close thumbnail pixbuf loader for %s: %s", path, error->message);
+		} else {
+			g_message ("Failed to close thumbnail pixbuf loader for %s", path);
+		}
 
 		g_object_unref (G_OBJECT (loader));
 		g_error_free (error);