mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-06-13 14:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge af7c6ec7b1 into 9c663b1fa1

Browse source
This commit is contained in:
Martin Fischer 2026-05-22 12:10:21 +08:00 • committed by GitHub
commit 75de01e581
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/config/input.c
View file

@ -117,10 +117,13 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
free(dst->xkb_file); free(dst->xkb_file);
dst->xkb_file = src->xkb_file ? strdup(src->xkb_file) : NULL; dst->xkb_file = src->xkb_file ? strdup(src->xkb_file) : NULL;
dst->xkb_file_is_set = dst->xkb_file != NULL; dst->xkb_file_is_set = dst->xkb_file != NULL;
dst->xkb_layout = NULL;
} }
if (src->xkb_layout) { if (src->xkb_layout) {
free(dst->xkb_layout); free(dst->xkb_layout);
dst->xkb_layout = strdup(src->xkb_layout); dst->xkb_layout = strdup(src->xkb_layout);
dst->xkb_file = NULL;
dst->xkb_file_is_set = false;
} }
if (src->xkb_model) { if (src->xkb_model) {
free(dst->xkb_model); free(dst->xkb_model);