From 736a1ca0a367b2b455576b3fbedc37e539165024 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 17 Feb 2022 20:14:08 -0600
Subject: [PATCH] Fix merge conflict resolution error in flux_led (#66775)
---
homeassistant/components/flux_led/select.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/homeassistant/components/flux_led/select.py b/homeassistant/components/flux_led/select.py
index 7edf0ef50f8..4067110e336 100644
--- a/homeassistant/components/flux_led/select.py
+++ b/homeassistant/components/flux_led/select.py
@@ -110,7 +110,7 @@ class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
) -> None:
"""Initialize the power state select."""
super().__init__(device, entry)
- self._attr_name = f"{entry.data[CONF_NAME]} Power Restored"
+ self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Power Restored"
base_unique_id = entry.unique_id or entry.entry_id
self._attr_unique_id = f"{base_unique_id}_power_restored"
self._async_set_current_option_from_device()
@@ -237,7 +237,7 @@ class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
) -> None:
"""Initialize the white channel select."""
super().__init__(device, entry)
- self._attr_name = f"{entry.data[CONF_NAME]} White Channel"
+ self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} White Channel"
base_unique_id = entry.unique_id or entry.entry_id
self._attr_unique_id = f"{base_unique_id}_white_channel"
--
GitLab