aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-20 06:12:08 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-20 06:12:08 -0500
commit63f7fb95172a72436698a1562b4f7ea1e9100a7e (patch)
tree7b1191368f446c7ee24ce41eb36d0cd3a86a6c35 /sway/input
parentfix memory leak in swaymsg (diff)
downloadsway-63f7fb95172a72436698a1562b4f7ea1e9100a7e.tar.gz
sway-63f7fb95172a72436698a1562b4f7ea1e9100a7e.tar.zst
sway-63f7fb95172a72436698a1562b4f7ea1e9100a7e.zip
cleanup
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/input-manager.c9
-rw-r--r--sway/input/seat.c1
2 files changed, 6 insertions, 4 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index b20b7b7e..4459c43b 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -119,10 +119,11 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
119 119
120 bool added = false; 120 bool added = false;
121 wl_list_for_each(seat, &input->seats, link) { 121 wl_list_for_each(seat, &input->seats, link) {
122 if (seat->config && 122 bool has_attachment = seat->config &&
123 (seat_config_get_attachment(seat->config, 123 (seat_config_get_attachment(seat->config, input_device->identifier) ||
124 input_device->identifier) || 124 seat_config_get_attachment(seat->config, "*"));
125 seat_config_get_attachment(seat->config, "*"))) { 125
126 if (has_attachment) {
126 sway_seat_add_device(seat, input_device); 127 sway_seat_add_device(seat, input_device);
127 added = true; 128 added = true;
128 } 129 }
diff --git a/sway/input/seat.c b/sway/input/seat.c
index df1427fa..fe90565a 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -30,6 +30,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
30 30
31 seat->wlr_seat = wlr_seat_create(input->server->wl_display, seat_name); 31 seat->wlr_seat = wlr_seat_create(input->server->wl_display, seat_name);
32 if (!sway_assert(seat->wlr_seat, "could not allocate seat")) { 32 if (!sway_assert(seat->wlr_seat, "could not allocate seat")) {
33 free(seat);
33 return NULL; 34 return NULL;
34 } 35 }
35 36