From bc6b1de47299610107e9a50c9ad3a0fc98000701 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Wed, 15 Jul 2020 12:33:03 -0400 Subject: [PATCH] gui: correctly show initial value for choice settings --- lib/logitech_receiver/settings.py | 2 +- lib/solaar/ui/config_panel.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index 8ef8d953..820c7f59 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -656,7 +656,7 @@ class ChoicesValidator(object): def __init__(self, choices, bytes_count=None, read_skip_bytes_count=None, write_prefix_bytes=b'', **_ignore): assert choices is not None assert isinstance(choices, _NamedInts) - assert len(choices) > 2 + assert len(choices) > 1 self.choices = choices self.needs_current_value = False diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py index a737518f..864c79ea 100644 --- a/lib/solaar/ui/config_panel.py +++ b/lib/solaar/ui/config_panel.py @@ -242,7 +242,7 @@ def _update_setting_item(sbox, value, is_online=True): if isinstance(control, Gtk.Switch): control.set_active(value) elif isinstance(control, Gtk.ComboBoxText): - control.set_active_id(str(value)) + control.set_active_id(str(int(value))) elif isinstance(control, Gtk.Scale): control.set_value(int(value)) elif isinstance(control, Gtk.HBox):