diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2024-11-10 22:25:18 -0500 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2024-11-10 22:30:30 -0500 |
| commit | 9baadd4a9501d277cc7d493f585de78d5f303922 (patch) | |
| tree | 0cb3eb53206a9cf6d345a04c6f7927325f68221b | |
| parent | 7288d9e5d2daa9ce74ae028c3d28d537ed24ffd7 (diff) | |
| download | rockbox-9baadd4a95.tar.gz rockbox-9baadd4a95.zip | |
[Fix Red] 7288d9e Move cfg_vals from settings_list, expand settings_dumper
Change-Id: Ic1dc9eb46b5eed8adc1888e8b7e58d45f4f1c57a
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 2 | ||||
| -rw-r--r-- | apps/settings_list.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f76e499c36..975a6d93bc 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1606,7 +1606,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no, break; case F_T_INT: case F_T_UINT: - if (setting_get_cfgvals(s->setting) == NULL) + if (setting_get_cfgvals(setting) == NULL) { touchsetting->value.number = atoi(text); } diff --git a/apps/settings_list.c b/apps/settings_list.c index 599a73b42a..f2db4efd26 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1023,7 +1023,7 @@ const struct settings_list settings[] = { #ifdef HAVE_LCD_CONTRAST /* its easier to leave this one un-macro()ed for the time being */ { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.contrast, - LANG_CONTRAST, FUNCTYPE(lcd_default_contrast), "contrast", NULL , { + LANG_CONTRAST, FUNCTYPE(lcd_default_contrast), "contrast", { .int_setting = (struct int_setting[]) { { .option_callback = lcd_set_contrast, .unit = UNIT_INT, .step = 1, @@ -1153,7 +1153,7 @@ const struct settings_list settings[] = { /* its easier to leave this one un-macro()ed for the time being */ { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.battery_capacity, LANG_BATTERY_CAPACITY, FUNCTYPE(battery_default_capacity), - "battery capacity", NULL , { + "battery capacity" , { .int_setting = (struct int_setting[]) { { .option_callback = set_battery_capacity, .unit = UNIT_MAH, .step = BATTERY_CAPACITY_INC, |