From 8be2ca110a836636ddcc5159b9d2779e87a5a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius?= Date: Fri, 21 Jan 2022 18:14:25 -0300 Subject: [PATCH] ui: avoid conflicts when settings with the same name have different labels for the same number --- lib/solaar/ui/diversion_rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/solaar/ui/diversion_rules.py b/lib/solaar/ui/diversion_rules.py index 2fd89bdb..6b1eb2c9 100644 --- a/lib/solaar/ui/diversion_rules.py +++ b/lib/solaar/ui/diversion_rules.py @@ -2097,7 +2097,7 @@ class SetUI(ActionUI): if kind in (_SKIND.toggle, _SKIND.multiple_toggle): self.value_field.make_toggle() elif kind in (_SKIND.choice, _SKIND.map_choice): - all_values, extra = self._all_choices(setting_name) + all_values, extra = self._all_choices(device_setting or setting_name) self.value_field.make_choice(all_values, extra) supported_values = None if device_setting: @@ -2196,7 +2196,7 @@ class SetUI(ActionUI): disp.append(key_label or key) value = next(a, None) if setting and (kind in (_SKIND.choice, _SKIND.map_choice)): - all_values = cls._all_choices(setting_name)[0] + all_values = cls._all_choices(setting or setting_name)[0] if isinstance(all_values, NamedInts): value = all_values[value] disp.append(value)