Fix double reloading in esphome (#155142)

homeassistant/components/esphome/config_flow.py

@@ -31,7 +31,7 @@ from homeassistant.config_entries import (
     ConfigFlow,
     ConfigFlowResult,
     FlowType,
-    OptionsFlow,
+    OptionsFlowWithReload,
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
@@ -918,7 +918,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         return OptionsFlowHandler()
 
 
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithReload):
     """Handle a option flow for esphome."""
 
     async def async_step_init(

homeassistant/components/esphome/entry_data.py

@@ -442,14 +442,6 @@ class RuntimeEntryData:
             # save delay has passed.
             await self.store.async_save(self._pending_storage())
 
-    async def async_update_listener(
-        self, hass: HomeAssistant, entry: ESPHomeConfigEntry
-    ) -> None:
-        """Handle options update."""
-        if self.original_options == entry.options:
-            return
-        hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
-
     @callback
     def async_on_disconnect(self) -> None:
         """Call when the entry has been disconnected.

homeassistant/components/esphome/manager.py

@@ -983,10 +983,6 @@ class ESPHomeManager:
 
         await reconnect_logic.start()
 
-        entry.async_on_unload(
-            entry.add_update_listener(entry_data.async_update_listener)
-        )
-
 
 @callback
 def _async_setup_device_registry(