From 802e366db7049f1d8fdab6f38f968bcf0c55b3ae Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Thu, 3 Aug 2023 17:12:05 -0700 Subject: *: nested settings should get the raw value When creating nested setting instances, just pass down the full raw value so if there's any prefix on the value it can be realized as a prefix for the first entry in the nested instance. --- src/modules/rkt/rkt_scener.c | 2 +- src/setup.c | 2 +- src/til.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/modules/rkt/rkt_scener.c b/src/modules/rkt/rkt_scener.c index 87d9e18..6b3f8bb 100644 --- a/src/modules/rkt/rkt_scener.c +++ b/src/modules/rkt/rkt_scener.c @@ -1080,7 +1080,7 @@ int rkt_scener_update(rkt_context_t *ctxt) return rkt_scener_err_close(scener, r); } - setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, setting->value); + setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, til_setting_get_raw_value(setting)); free(label); if (!setting->value_as_nested_settings) { diff --git a/src/setup.c b/src/setup.c index de71262..acca929 100644 --- a/src/setup.c +++ b/src/setup.c @@ -90,7 +90,7 @@ int setup_interactively(til_settings_t *settings, int (*setup_func)(const til_se return r; } - setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, setting->value); + setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, til_setting_get_raw_value(setting)); free(label); /* FIXME: til_settings_new() seems like it should return an errno, since it can encounter parse errors too? */ diff --git a/src/til.c b/src/til.c index b660d2f..4629dd7 100644 --- a/src/til.c +++ b/src/til.c @@ -719,7 +719,7 @@ int til_module_setup_randomize(const til_module_t *module, til_settings_t *setti break; } - setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, setting->value); + setting->value_as_nested_settings = til_settings_new(NULL, desc->container, desc->spec.key ? : label, til_setting_get_raw_value(setting)); free(label); if (!setting->value_as_nested_settings) { -- cgit v1.2.1