[gimp] Bug 792744 - Gimp crashes attempting to merge down a hidden layer
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Bug 792744 - Gimp crashes attempting to merge down a hidden layer
- Date: Sun, 21 Jan 2018 23:02:04 +0000 (UTC)
commit 36dd16c6c63ac479fd50104cd72d0f30d21efb3c
Author: Michael Natterer <mitch gimp org>
Date: Mon Jan 22 00:00:57 2018 +0100
Bug 792744 - Gimp crashes attempting to merge down a hidden layer
layers_actions_update(): make the merge down action insensitive
if the current layer is invisible.
app/actions/layers-actions.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index da0083e..34c1f15 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -757,6 +757,7 @@ layers_actions_update (GimpActionGroup *group,
gboolean lock_alpha = FALSE;
gboolean can_lock_alpha = FALSE;
gboolean text_layer = FALSE;
+ gboolean visible = FALSE;
gboolean writable = FALSE;
gboolean movable = FALSE;
gboolean children = FALSE;
@@ -842,6 +843,7 @@ layers_actions_update (GimpActionGroup *group,
lock_alpha = gimp_layer_get_lock_alpha (layer);
can_lock_alpha = gimp_layer_can_lock_alpha (layer);
alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (layer));
+ visible = gimp_item_get_visible (GIMP_ITEM (layer));
writable = ! gimp_item_is_content_locked (GIMP_ITEM (layer));
movable = ! gimp_item_is_position_locked (GIMP_ITEM (layer));
@@ -936,7 +938,7 @@ layers_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("layers-lower-to-bottom", layer && !fs && !ac && next);
SET_SENSITIVE ("layers-anchor", layer && fs && !ac);
- SET_SENSITIVE ("layers-merge-down", layer && !fs && !ac && next_visible);
+ SET_SENSITIVE ("layers-merge-down", layer && !fs && !ac && visible && next_visible);
SET_VISIBLE ("layers-merge-group", children);
SET_SENSITIVE ("layers-merge-group", layer && !fs && !ac && children);
SET_SENSITIVE ("layers-merge-layers", layer && !fs && !ac);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]