ui: guard against typeerror when setting the value of a control box

pwr-Solaar · Feb 4, 2025 · 7d4f787 · 7d4f787
1 parent e297f90
commit 7d4f787
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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