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

[martinn svn gnome org]

Author: martinn
Date: Wed Jan 23 20:45:35 2008
New Revision: 24697
URL: http://svn.gnome.org/viewvc/gimp?rev=24697&view=rev

Log:
2008-01-23  Martin Nordholts  <martinn svn gnome org>

	Merged from trunk:

	* app/tools/gimprectangleselecttool.c
	(gimp_rect_select_tool_execute): Reset the automatic undo/redo
	mechanism so that commiting pending rectangles with Return
	works (bug #511599).


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

Modified: branches/gimp-2-4/app/tools/gimprectangleselecttool.c
==============================================================================
--- branches/gimp-2-4/app/tools/gimprectangleselecttool.c	(original)
+++ branches/gimp-2-4/app/tools/gimprectangleselecttool.c	Wed Jan 23 20:45:35 2008
@@ -654,6 +654,8 @@
                                gint               w,
                                gint               h)
 {
+  GimpRectSelectTool *rect_select = GIMP_RECT_SELECT_TOOL (rectangle);
+
   if (w == 0 && h == 0)
     {
       GimpImage   *image     = GIMP_TOOL (rectangle)->display->image;
@@ -708,6 +710,10 @@
   gimp_rect_select_tool_update_option_defaults (GIMP_RECT_SELECT_TOOL (rectangle),
                                                 FALSE);
 
+  /* Reset the automatic undo/redo mechanism */
+  rect_select->undo = NULL;
+  rect_select->redo = NULL;
+
   return TRUE;
 }