From 8258fa515d3f40e250d8d1b9f7e719453f183322 Mon Sep 17 00:00:00 2001 From: uvjustin <46082645+uvjustin@users.noreply.github.com> Date: Tue, 19 May 2020 03:40:39 +0800 Subject: [PATCH] Skip forked_daapd ignored entries with empty entry.data (#35772) --- homeassistant/components/forked_daapd/config_flow.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/forked_daapd/config_flow.py b/homeassistant/components/forked_daapd/config_flow.py index 697c3f0c7ac..c860e08ffc4 100644 --- a/homeassistant/components/forked_daapd/config_flow.py +++ b/homeassistant/components/forked_daapd/config_flow.py @@ -163,18 +163,18 @@ class ForkedDaapdFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): ): return self.async_abort(reason="not_forked_daapd") + await self.async_set_unique_id(discovery_info["properties"]["Machine Name"]) + self._abort_if_unique_id_configured() + # Update title and abort if we already have an entry for this host for entry in self._async_current_entries(): - if entry.data[CONF_HOST] != discovery_info["host"]: + if entry.data.get(CONF_HOST) != discovery_info["host"]: continue self.hass.config_entries.async_update_entry( entry, title=discovery_info["properties"]["Machine Name"], ) return self.async_abort(reason="already_configured") - await self.async_set_unique_id(discovery_info["properties"]["Machine Name"]) - self._abort_if_unique_id_configured() - zeroconf_data = { CONF_HOST: discovery_info["host"], CONF_PORT: int(discovery_info["port"]),