From b49d47a559cf25f194eda931b0140a8399752c69 Mon Sep 17 00:00:00 2001 From: starkillerOG Date: Fri, 2 Sep 2022 23:50:52 +0200 Subject: [PATCH] Register xiaomi_miio unload callbacks later in setup (#76714) --- homeassistant/components/xiaomi_miio/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py index 9f0be1da528..8719319aec8 100644 --- a/homeassistant/components/xiaomi_miio/__init__.py +++ b/homeassistant/components/xiaomi_miio/__init__.py @@ -387,8 +387,6 @@ async def async_setup_gateway_entry(hass: HomeAssistant, entry: ConfigEntry) -> if gateway_id.endswith("-gateway"): hass.config_entries.async_update_entry(entry, unique_id=entry.data["mac"]) - entry.async_on_unload(entry.add_update_listener(update_listener)) - # Connect to gateway gateway = ConnectXiaomiGateway(hass, entry) try: @@ -444,6 +442,8 @@ async def async_setup_gateway_entry(hass: HomeAssistant, entry: ConfigEntry) -> await hass.config_entries.async_forward_entry_setups(entry, GATEWAY_PLATFORMS) + entry.async_on_unload(entry.add_update_listener(update_listener)) + async def async_setup_device_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Set up the Xiaomi Miio device component from a config entry.""" @@ -453,10 +453,10 @@ async def async_setup_device_entry(hass: HomeAssistant, entry: ConfigEntry) -> b if not platforms: return False - entry.async_on_unload(entry.add_update_listener(update_listener)) - await hass.config_entries.async_forward_entry_setups(entry, platforms) + entry.async_on_unload(entry.add_update_listener(update_listener)) + return True