[gimp/gimp-2-10] app: Correctly place merged down layer...

[Stanislav Grinkov <sgrinkov src gnome org>]

commit 16fe52582dde066ecc9df4992c9be7c19e5b2467
Author: Stanislav Grinkov <43956-stanislavgrinkov users noreply gitlab gnome org>
Date:   Wed Aug 11 01:09:28 2021 +0600

    app: Correctly place merged down layer...
    
    when the image is in indexed color mode, and bottom layer doesn't
    have an alpha channel.
    
    Resolves: #4945

 app/core/gimpimage-merge.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 2b35e9b199..3d968606d5 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -620,8 +620,6 @@ gimp_image_merge_layers (GimpImage     *image,
 
       flatten_node = gimp_gegl_create_flatten_node (
         &bg, gimp_layer_get_real_composite_space (bottom_layer));
-
-      position = 0;
     }
   else
     {
@@ -643,7 +641,14 @@ gimp_image_merge_layers (GimpImage     *image,
 
           return NULL;
         }
+    }
 
+  if (merge_type == GIMP_FLATTEN_IMAGE)
+    {
+      position = 0;
+    }
+  else
+    {
       /*  Find the index in the layer list of the bottom layer--we need this
        *  in order to add the final, merged layer to the layer list correctly
        */