gimp r24619 - in branches/gimp-2-4: . app/tools

[mitch svn gnome org]

Author: mitch
Date: Tue Jan 15 14:46:11 2008
New Revision: 24619
URL: http://svn.gnome.org/viewvc/gimp?rev=24619&view=rev

Log:
2008-01-15  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	* app/tools/gimpimagemaptool.c (gimp_image_map_tool_notify_preview):
	check for image_map_tool->image_map also when the preview is
	switched on, not only when it's switched off.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/tools/gimpimagemaptool.c

Modified: branches/gimp-2-4/app/tools/gimpimagemaptool.c
==============================================================================
--- branches/gimp-2-4/app/tools/gimpimagemaptool.c	(original)
+++ branches/gimp-2-4/app/tools/gimpimagemaptool.c	Tue Jan 15 14:46:11 2008
@@ -524,17 +524,17 @@
   GimpTool            *tool    = GIMP_TOOL (image_map_tool);
   GimpImageMapOptions *options = GIMP_IMAGE_MAP_OPTIONS (config);
 
-  if (options->preview)
+  if (image_map_tool->image_map)
     {
-      gimp_tool_control_set_preserve (tool->control, TRUE);
+      if (options->preview)
+        {
+          gimp_tool_control_set_preserve (tool->control, TRUE);
 
-      gimp_image_map_tool_map (image_map_tool);
+          gimp_image_map_tool_map (image_map_tool);
 
-      gimp_tool_control_set_preserve (tool->control, FALSE);
-    }
-  else
-    {
-      if (image_map_tool->image_map)
+          gimp_tool_control_set_preserve (tool->control, FALSE);
+        }
+      else
         {
           gimp_tool_control_set_preserve (tool->control, TRUE);