gimp r27820 - branches/gimp-2-6/app/tools

[neo svn gnome org]

Author: neo
Date: Sun Dec 21 15:50:08 2008
New Revision: 27820
URL: http://svn.gnome.org/viewvc/gimp?rev=27820&view=rev

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

	Merged from trunk:

	Bug 564869 â GIMP crashes on selecting Tools->GEGL operation

	* app/tools/gimptool.c (gimp_tool_initialize): check if the tool
	has set an error.



Modified:
   branches/gimp-2-6/app/tools/gimptool.c

Modified: branches/gimp-2-6/app/tools/gimptool.c
==============================================================================
--- branches/gimp-2-6/app/tools/gimptool.c	(original)
+++ branches/gimp-2-6/app/tools/gimptool.c	Sun Dec 21 15:50:08 2008
@@ -427,8 +427,12 @@
 
   if (! GIMP_TOOL_GET_CLASS (tool)->initialize (tool, display, &error))
     {
-      gimp_tool_message (tool, display, error->message);
-      g_clear_error (&error);
+      if (error)
+        {
+          gimp_tool_message (tool, display, error->message);
+          g_clear_error (&error);
+        }
+
       return FALSE;
     }