summaryrefslogtreecommitdiff
path: root/openbox/actions.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2011-10-16 11:10:14 -0400
committerDana Jansens <danakj@orodu.net>2012-09-30 14:46:11 -0400
commitad5b92588fbe36100cdc4ae7064883cd16e13a1e (patch)
tree4a6cd8ce8adac234350dc6866da9a5c93ed20c38 /openbox/actions.c
parent58f666a2a5111a16cbb1b416852e90c4c79f6671 (diff)
Don't make desktop switching interactive when no mods used. (Fix bug #5203)
Make mod state passing more consistent, and always give actions the full state instead of stripping sometimes. (They ended up expecting it stripped always).
Diffstat (limited to 'openbox/actions.c')
-rw-r--r--openbox/actions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/actions.c b/openbox/actions.c
index ee9d55f1..2d3438cf 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -375,7 +375,7 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
interactive_act = act;
actions_act_ref(interactive_act);
- interactive_initial_state = obt_keyboard_only_modmasks(state);
+ interactive_initial_state = state;
/* if using focus_delay, stop the timer now so that focus doesn't go
moving on us, which would kill the action */