diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2017-12-29 11:25:07 +0100 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 00:07:34 +0100 |
commit | afca73b6fc799790a1e4c4f103788c357ebecb74 (patch) | |
tree | c9b02c237f920aae00fb12d6dfad7e1af7102097 /sway/commands.c | |
parent | Merge pull request #1549 from rkanati/wlroots (diff) | |
download | sway-afca73b6fc799790a1e4c4f103788c357ebecb74.tar.gz sway-afca73b6fc799790a1e4c4f103788c357ebecb74.tar.zst sway-afca73b6fc799790a1e4c4f103788c357ebecb74.zip |
apply_input_config: restore previous `current_input_config`
This is important for freeing the proper one at end of block
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/commands.c b/sway/commands.c index b0078a46..b7432bf6 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -70,8 +70,10 @@ void apply_input_config(struct input_config *input) { | |||
70 | list_add(config->input_configs, input); | 70 | list_add(config->input_configs, input); |
71 | } | 71 | } |
72 | 72 | ||
73 | struct input_config *old_input_config = current_input_config; | ||
73 | current_input_config = input; | 74 | current_input_config = input; |
74 | sway_input_manager_apply_input_config(input_manager, input); | 75 | sway_input_manager_apply_input_config(input_manager, input); |
76 | current_input_config = old_input_config; | ||
75 | } | 77 | } |
76 | 78 | ||
77 | void apply_seat_config(struct seat_config *seat) { | 79 | void apply_seat_config(struct seat_config *seat) { |