gimp r27210 - in branches/gimp-2-6: . app/tools

[mitch svn gnome org]

Author: mitch
Date: Fri Oct 10 15:42:13 2008
New Revision: 27210
URL: http://svn.gnome.org/viewvc/gimp?rev=27210&view=rev

Log:
2008-10-10  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	* app/tools/gimpmovetool.c (gimp_move_tool_button_release): flush
	the image after setting active items back from temporarily
	selected ones. Fixes menu item sensitivity.



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

Modified: branches/gimp-2-6/app/tools/gimpmovetool.c
==============================================================================
--- branches/gimp-2-6/app/tools/gimpmovetool.c	(original)
+++ branches/gimp-2-6/app/tools/gimpmovetool.c	Fri Oct 10 15:42:13 2008
@@ -453,6 +453,8 @@
     }
   else
     {
+      gboolean flush = FALSE;
+
       if (! config->move_tool_changes_active ||
           (release_type == GIMP_BUTTON_RELEASE_CANCEL))
         {
@@ -461,6 +463,8 @@
               gimp_image_set_active_layer (display->image,
                                            move->old_active_layer);
               move->old_active_layer = NULL;
+
+              flush = TRUE;
             }
 
           if (move->old_active_vectors)
@@ -468,6 +472,8 @@
               gimp_image_set_active_vectors (display->image,
                                              move->old_active_vectors);
               move->old_active_vectors = NULL;
+
+              flush = TRUE;
             }
         }
 
@@ -476,9 +482,13 @@
           if (move->floating_layer)
             {
               floating_sel_anchor (move->floating_layer);
-              gimp_image_flush (display->image);
+
+              flush = TRUE;
             }
         }
+
+      if (flush)
+        gimp_image_flush (display->image);
     }
 }