From 8fd968e5bf1e7c4cd0e61a50bb80cc854c112b3f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Jun 2019 21:19:19 -0400 Subject: action muxer: Don't activate disabled actions We really shouldn't. --- gtk/gtkactionmuxer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c index b752ea08e7..23c4f56a5a 100644 --- a/gtk/gtkactionmuxer.c +++ b/gtk/gtkactionmuxer.c @@ -648,10 +648,13 @@ gtk_action_muxer_activate_action (GActionGroup *action_group, GtkWidgetAction *action = g_ptr_array_index (muxer->widget_actions, i); if (strcmp (action->name, action_name) == 0) { - if (action->activate) - action->activate (muxer->widget, action->name, parameter); - else if (action->pspec) - prop_action_activate (muxer->widget, action, parameter); + if (muxer->widget_actions_enabled[i]) + { + if (action->activate) + action->activate (muxer->widget, action->name, parameter); + else if (action->pspec) + prop_action_activate (muxer->widget, action, parameter); + } return; } -- cgit v1.2.1