From 34301cc11e5d9de7f68367d12f5e5acf5af4fbcb Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Sat, 1 Feb 2025 14:42:33 -0500 Subject: [PATCH] ui: guard against typeerror when setting the value of a control box --- lib/solaar/ui/config_panel.py | 5 ++++- tests/logitech_receiver/test_setting_templates.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py index 5eed081104..588ceccf79 100644 --- a/lib/solaar/ui/config_panel.py +++ b/lib/solaar/ui/config_panel.py @@ -715,7 +715,10 @@ def _update_setting_item(sbox, value, is_online=True, sensitive=True, null_okay= return sbox._failed.set_visible(False) sbox._control.set_sensitive(False) - sbox._control.set_value(value) + try: # a call was producing a TypeError so guard against that + sbox._control.set_value(value) + except TypeError as e: + logger.warning("%s: error setting control value (%s): %s", sbox.setting.name, sbox.setting._device, repr(e)) sbox._control.set_sensitive(sensitive is True) _change_icon(sensitive, sbox._change_icon) diff --git a/tests/logitech_receiver/test_setting_templates.py b/tests/logitech_receiver/test_setting_templates.py index ec83497649..4b05c604d0 100644 --- a/tests/logitech_receiver/test_setting_templates.py +++ b/tests/logitech_receiver/test_setting_templates.py @@ -502,7 +502,8 @@ def test_simple_template(test, mocker, mock_gethostname): assert setting.choices == test.choices value = setting.read(cached=False) - assert value == tst.initial_value + unreadable = hasattr(setting._rw, "read_fnid") and setting._rw.read_fnid is None + assert value == (tst.initial_value if not unreadable else None) cached_value = setting.read(cached=True) assert cached_value == tst.initial_value