gimp r24695 - in branches/gimp-2-4: . app/display

[neo svn gnome org]

Author: neo
Date: Wed Jan 23 18:12:30 2008
New Revision: 24695
URL: http://svn.gnome.org/viewvc/gimp?rev=24695&view=rev

Log:
2008-01-23  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* app/display/gimpdisplayshell-selection.c: show the selection,
	even if the window is flagged as invisible, but don't start the
	animation. Addresses bug #505758.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/display/gimpdisplayshell-selection.c

Modified: branches/gimp-2-4/app/display/gimpdisplayshell-selection.c
==============================================================================
--- branches/gimp-2-4/app/display/gimpdisplayshell-selection.c	(original)
+++ branches/gimp-2-4/app/display/gimpdisplayshell-selection.c	Wed Jan 23 18:12:30 2008
@@ -245,8 +245,8 @@
 {
   selection_stop (selection);
 
-  /*  If this selection is paused or invisible, do not start it  */
-  if (selection->paused == 0 && selection->visible)
+  /*  If this selection is paused, do not start it  */
+  if (selection->paused == 0)
     {
       selection->timeout = g_idle_add ((GSourceFunc) selection_start_timeout,
                                        selection);
@@ -696,11 +696,11 @@
                                    selection->num_segs_out);
 
 
-      if (selection->segs_in)
+      if (selection->segs_in && selection->visible)
         selection->timeout = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
                                                  config->marching_ants_speed,
                                                  (GSourceFunc) selection_timeout,
-                                                  selection, NULL);
+                                                 selection, NULL);
     }
 
   return FALSE;