diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2018-04-02 11:44:42 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 11:44:42 -0400 |
| commit | a82c107c7613548a3ae0e75bb951ba57b7d2f22b (patch) | |
| tree | c98359e87642355925dc1dda415aeebb1a01e071 /sway/commands.c | |
| parent | dont copy seat config on the seat (diff) | |
| download | sway-a82c107c7613548a3ae0e75bb951ba57b7d2f22b.tar.gz sway-a82c107c7613548a3ae0e75bb951ba57b7d2f22b.tar.zst sway-a82c107c7613548a3ae0e75bb951ba57b7d2f22b.zip | |
80col
Diffstat (limited to 'sway/commands.c')
| -rw-r--r-- | sway/commands.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/commands.c b/sway/commands.c index dc6c867f..9e83a401 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
| @@ -75,20 +75,20 @@ void apply_input_config(struct input_config *input) { | |||
| 75 | input_manager_apply_input_config(input_manager, input); | 75 | input_manager_apply_input_config(input_manager, input); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | void apply_seat_config(struct seat_config *seat) { | 78 | void apply_seat_config(struct seat_config *seat_config) { |
| 79 | int i; | 79 | int i; |
| 80 | i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name); | 80 | i = list_seq_find(config->seat_configs, seat_name_cmp, seat_config->name); |
| 81 | if (i >= 0) { | 81 | if (i >= 0) { |
| 82 | // merge existing config | 82 | // merge existing config |
| 83 | struct seat_config *sc = config->seat_configs->items[i]; | 83 | struct seat_config *sc = config->seat_configs->items[i]; |
| 84 | merge_seat_config(sc, seat); | 84 | merge_seat_config(sc, seat_config); |
| 85 | free_seat_config(seat); | 85 | free_seat_config(seat_config); |
| 86 | seat = sc; | 86 | seat_config = sc; |
| 87 | } else { | 87 | } else { |
| 88 | list_add(config->seat_configs, seat); | 88 | list_add(config->seat_configs, seat_config); |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | input_manager_apply_seat_config(input_manager, seat); | 91 | input_manager_apply_seat_config(input_manager, seat_config); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | /* Keep alphabetized */ | 94 | /* Keep alphabetized */ |