[gimp/gimp-2-8] Bug 731362 - Merging layers (outside layer folders)...

[Michael Natterer <mitch src gnome org>]

commit cd114a162e0b7430213246a50f5277dedce9f79f
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jun 29 20:54:30 2014 +0200

    Bug 731362 - Merging layers (outside layer folders)...
    
    ...causes layer folders to expand
    
    In gimp_image_remove_layer(), don't use the top element of
    image->layer_stack as the new active layer, because it is simply some
    arbitrary layer that was previously selected. That stack is only good
    for finding the last active layer when returning from the channels
    dialog. Instead, let the proper logic run and use the new active item
    returned by gimp_item_tree_remove_item(), which is the layer below the
    removed one, if any, or the one above it otherwise.
    
    (cherry picked from commit 0e2b8f236d6bdb953439ee229e84e22e58b636aa)

 app/core/gimpimage.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 6c81be6..2bb7b81 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -3839,9 +3839,6 @@ gimp_image_remove_layer (GimpImage *image,
       g_list_free (children);
     }
 
-  if (! new_active && private->layer_stack)
-    new_active = private->layer_stack->data;
-
   new_active =
     GIMP_LAYER (gimp_item_tree_remove_item (private->layers,
                                             GIMP_ITEM (layer),