mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3563 from vilhalmer/fix-wildcard-seat-constrain-crashes-during-reconfig

Browse source 
Fix wildcard seat constrain crashes during reconfig
This commit is contained in:
Brian Ashworth 2019-02-03 14:00:37 -05:00 committed by GitHub
commit 8e60efe0bf
Failed to generate hash of commit
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/config.c
View file

@ -141,6 +141,11 @@ static void destroy_removed_seats(struct sway_config *old_config,
int i; int i;
for (i = 0; i < old_config->seat_configs->length; i++) { for (i = 0; i < old_config->seat_configs->length; i++) {
seat_config = old_config->seat_configs->items[i]; seat_config = old_config->seat_configs->items[i];
// Skip the wildcard seat config, it won't have a matching real seat.
if (strcmp(seat_config->name, "*") == 0) {
continue;
}
/* Also destroy seats that aren't present in new config */ /* Also destroy seats that aren't present in new config */
if (new_config && list_seq_find(new_config->seat_configs, if (new_config && list_seq_find(new_config->seat_configs,
seat_name_cmp, seat_config->name) < 0) { seat_name_cmp, seat_config->name) < 0) {

6
sway/input/cursor.c
View file

@ -1459,7 +1459,11 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
void sway_cursor_constrain(struct sway_cursor *cursor, void sway_cursor_constrain(struct sway_cursor *cursor,
struct wlr_pointer_constraint_v1 *constraint) { struct wlr_pointer_constraint_v1 *constraint) {
struct seat_config *config = seat_get_config(cursor->seat); struct seat_config *config = seat_get_config(cursor->seat);
if (config->allow_constrain == CONSTRAIN_DISABLE) { if (!config) {
config = seat_get_config_by_name("*");
}
if (!config || config->allow_constrain == CONSTRAIN_DISABLE) {
return; return;
} }