From 1a874c39d7b97912d330fb54cbcdf5a76093fbeb Mon Sep 17 00:00:00 2001
From: "Peter F. Patel-Schneider" <pfpschneider@gmail.com>
Date: Sun, 24 Mar 2024 11:21:20 -0400
Subject: [PATCH] settings: permit continuing when a read during pushing fails

---
 lib/logitech_receiver/settings.py           | 14 ++++++--------
 lib/logitech_receiver/settings_templates.py |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py
index 8396a7e7..6fc9b7b1 100644
--- a/lib/logitech_receiver/settings.py
+++ b/lib/logitech_receiver/settings.py
@@ -200,15 +200,13 @@ class Setting:
         assert hasattr(self, "_device")
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug("%s: apply (%s)", self.name, self._device)
-        value = self.read(self.persist)  # Don't use persisted value if setting doesn't persist
-        if self.persist and value is not None:  # If setting doesn't persist no need to write value just read
-            try:
+        try:
+            value = self.read(self.persist)  # Don't use persisted value if setting doesn't persist
+            if self.persist and value is not None:  # If setting doesn't persist no need to write value just read
                 self.write(value, save=False)
-            except Exception as e:
-                if logger.isEnabledFor(logging.WARNING):
-                    logger.warning(
-                        "%s: error applying value %s so ignore it (%s): %s", self.name, self._value, self._device, repr(e)
-                    )
+        except Exception as e:
+            if logger.isEnabledFor(logging.WARNING):
+                logger.warning("%s: error applying %s so ignore it (%s): %s", self.name, self._value, self._device, repr(e))
 
     def __str__(self):
         if hasattr(self, "_value"):
diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py
index d6a4d6c4..f7564fd2 100644
--- a/lib/logitech_receiver/settings_templates.py
+++ b/lib/logitech_receiver/settings_templates.py
@@ -1564,8 +1564,8 @@ class RGBControl(_Setting):
 
 class RGBEffectSetting(LEDZoneSetting):
     name = "rgb_zone_"
-    label = _("RGB Zone Effects")
-    description = _("Set effect for RGB Zone")
+    label = _("LED Zone Effects")
+    description = _("Set effect for LED Zone")
     feature = _F.RGB_EFFECTS
 
     @classmethod