From 0949f7d0baca77e6ef011fb45048c3e3a7deb850 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Thu, 20 Feb 2025 08:57:55 +0100 Subject: [PATCH] Adjust config entry state checks in qbus (#138911) --- homeassistant/components/qbus/__init__.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/qbus/__init__.py b/homeassistant/components/qbus/__init__.py index da9dcfe69be..f77f439ecc1 100644 --- a/homeassistant/components/qbus/__init__.py +++ b/homeassistant/components/qbus/__init__.py @@ -71,17 +71,14 @@ async def async_unload_entry(hass: HomeAssistant, entry: QbusConfigEntry) -> boo if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS): entry.runtime_data.shutdown() - cleanup(hass, entry) + _cleanup(hass, entry) return unload_ok -def cleanup(hass: HomeAssistant, entry: QbusConfigEntry) -> None: +def _cleanup(hass: HomeAssistant, entry: QbusConfigEntry) -> None: """Shutdown if no more entries are loaded.""" - entries = hass.config_entries.async_loaded_entries(DOMAIN) - count = len(entries) - - # During unloading of the entry, it is not marked as unloaded yet. So - # count can be 1 if it is the last one. - if count <= 1 and (config_coordinator := hass.data.get(QBUS_KEY)): + if not hass.config_entries.async_loaded_entries(DOMAIN) and ( + config_coordinator := hass.data.get(QBUS_KEY) + ): config_coordinator.shutdown()