diff options
author | emersion <contact@emersion.fr> | 2018-10-20 08:42:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 08:42:56 +0200 |
commit | 75ea19c71b08e4b3dd1ad053944724fd91dc04bd (patch) | |
tree | 734b3ad6e6ef44d62ac6bbb1162a8bbb2ca28ae4 /sway/commands.c | |
parent | Merge pull request #2886 from RyanDwyer/fix-headless-unmap-crash (diff) | |
parent | Minor refactor of input manager (diff) | |
download | sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.gz sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.zst sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.zip |
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index 8db1df01..d1275a1e 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -68,7 +68,7 @@ void apply_seat_config(struct seat_config *seat_config) { | |||
68 | list_add(config->seat_configs, seat_config); | 68 | list_add(config->seat_configs, seat_config); |
69 | } | 69 | } |
70 | 70 | ||
71 | input_manager_apply_seat_config(input_manager, seat_config); | 71 | input_manager_apply_seat_config(seat_config); |
72 | } | 72 | } |
73 | 73 | ||
74 | /* Keep alphabetized */ | 74 | /* Keep alphabetized */ |
@@ -240,7 +240,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat, | |||
240 | 240 | ||
241 | if (seat == NULL) { | 241 | if (seat == NULL) { |
242 | // passing a NULL seat means we just pick the default seat | 242 | // passing a NULL seat means we just pick the default seat |
243 | seat = input_manager_get_default_seat(input_manager); | 243 | seat = input_manager_get_default_seat(); |
244 | if (!sway_assert(seat, "could not find a seat to run the command on")) { | 244 | if (!sway_assert(seat, "could not find a seat to run the command on")) { |
245 | return NULL; | 245 | return NULL; |
246 | } | 246 | } |