From d6513cef5dc3f2c20e1bf11ff6a468b60ce35aca Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 9 Nov 2017 17:47:59 -0500 Subject: [PATCH] rootston: add missing properties to kb config merge --- rootston/keyboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rootston/keyboard.c b/rootston/keyboard.c index da75b44f..72567eef 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -230,6 +230,12 @@ static void keyboard_config_merge(struct keyboard_config *config, if (config->options == NULL) { config->options = fallback->options; } + if (config->meta_key == 0) { + config->meta_key = fallback->meta_key; + } + if (config->name == NULL) { + config->name = fallback->name; + } } struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,