alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3386 from RedSoxFan/seat-reload-wait

Browse source 
reload: apply seat cfgs after reading entire cfg
This commit is contained in:
emersion 2019-01-09 10:01:17 +01:00 committed by GitHub
parent 8daea2bfec f33969358c
commit d06782c5e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands/seat.c
View file

@ -35,7 +35,9 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
struct seat_config *sc =
store_seat_config(config->handler_context.seat_config);
input_manager_apply_seat_config(sc);
if (!config->reading) {
input_manager_apply_seat_config(sc);
}
config->handler_context.seat_config = NULL;
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

4
sway/config.c
View file

@ -463,7 +463,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
if (config->swaynag_config_errors.pid > 0) {
swaynag_show(&config->swaynag_config_errors);
}
input_manager_verify_fallback_seat();
for (int i = 0; i < config->seat_configs->length; i++) {
input_manager_apply_seat_config(config->seat_configs->items[i]);
}
}
if (old_config) {