From 7be071a0e91771019fce9be8704e6dffc1d6e0af Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Jun 2024 21:07:19 +1200
Subject: [PATCH] [safe_mode] Set safe mode core data in disabled cases (#6983)

---
 esphome/components/safe_mode/__init__.py | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/esphome/components/safe_mode/__init__.py b/esphome/components/safe_mode/__init__.py
index 881937890d..185c0e70b1 100644
--- a/esphome/components/safe_mode/__init__.py
+++ b/esphome/components/safe_mode/__init__.py
@@ -56,21 +56,20 @@ CONFIG_SCHEMA = cv.All(
 
 @coroutine_with_priority(50.0)
 async def to_code(config):
-    if config[CONF_DISABLED]:
-        return
+    if not config[CONF_DISABLED]:
+        var = cg.new_Pvariable(config[CONF_ID])
+        await cg.register_component(var, config)
 
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
+        for conf in config.get(CONF_ON_SAFE_MODE, []):
+            trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+            await automation.build_automation(trigger, [], conf)
 
-    for conf in config.get(CONF_ON_SAFE_MODE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
+        condition = var.should_enter_safe_mode(
+            config[CONF_NUM_ATTEMPTS],
+            config[CONF_REBOOT_TIMEOUT],
+            config[CONF_BOOT_IS_GOOD_AFTER],
+        )
+        cg.add(RawExpression(f"if ({condition}) return"))
 
-    condition = var.should_enter_safe_mode(
-        config[CONF_NUM_ATTEMPTS],
-        config[CONF_REBOOT_TIMEOUT],
-        config[CONF_BOOT_IS_GOOD_AFTER],
-    )
-    cg.add(RawExpression(f"if ({condition}) return"))
     CORE.data[CONF_SAFE_MODE] = {}
     CORE.data[CONF_SAFE_MODE][KEY_PAST_SAFE_MODE] = True