From 43b6d6922c7abd5c1036a709d6fc1db7b68d02eb Mon Sep 17 00:00:00 2001 From: Christian Krippendorf Date: Fri, 11 Feb 2011 08:28:43 +0100 Subject: [PATCH] Bug 615227 - Undo while scaling layer freezes GIMP Don't run into an infinite loop when the undo editor is used while we're in the middle of an undo group. --- app/widgets/gimpundoeditor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/widgets/gimpundoeditor.c b/app/widgets/gimpundoeditor.c index 0b6baa09e6..aed78fe969 100644 --- a/app/widgets/gimpundoeditor.c +++ b/app/widgets/gimpundoeditor.c @@ -432,7 +432,8 @@ gimp_undo_editor_select_item (GimpContainerView *view, */ while (top_undo_item != NULL) { - gimp_image_undo (image); + if (! gimp_image_undo (image)) + break; top_undo_item = gimp_undo_stack_peek (undo_stack); } @@ -444,7 +445,8 @@ gimp_undo_editor_select_item (GimpContainerView *view, */ while (top_undo_item != undo) { - gimp_image_undo (image); + if(! gimp_image_undo (image)) + break; top_undo_item = gimp_undo_stack_peek (undo_stack); } @@ -456,7 +458,8 @@ gimp_undo_editor_select_item (GimpContainerView *view, */ while (top_undo_item != undo) { - gimp_image_redo (image); + if (! gimp_image_redo (image)) + break; top_undo_item = gimp_undo_stack_peek (undo_stack); }