From 6e9d759798e9b93a7c3e485b1210ab6c14389194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20H=C3=B6rsken?= Date: Mon, 1 Nov 2021 13:27:58 +0100 Subject: [PATCH] Fix OpenWeatherMap options not being initialized the first time (#58736) --- homeassistant/components/openweathermap/config_flow.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py index 507f1b6f721..0b7a3a1a25f 100644 --- a/homeassistant/components/openweathermap/config_flow.py +++ b/homeassistant/components/openweathermap/config_flow.py @@ -109,13 +109,15 @@ class OpenWeatherMapOptionsFlow(config_entries.OptionsFlow): vol.Optional( CONF_MODE, default=self.config_entry.options.get( - CONF_MODE, DEFAULT_FORECAST_MODE + CONF_MODE, + self.config_entry.data.get(CONF_MODE, DEFAULT_FORECAST_MODE), ), ): vol.In(FORECAST_MODES), vol.Optional( CONF_LANGUAGE, default=self.config_entry.options.get( - CONF_LANGUAGE, DEFAULT_LANGUAGE + CONF_LANGUAGE, + self.config_entry.data.get(CONF_LANGUAGE, DEFAULT_LANGUAGE), ), ): vol.In(LANGUAGES), }