From 5faa34886d4226ba27ae6903799e6888d97047f7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 12 Mar 2026 12:42:39 -1000
Subject: [PATCH] Avoid dangling else across preprocessor boundary

---
 esphome/components/debug/debug_rp2040.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/esphome/components/debug/debug_rp2040.cpp b/esphome/components/debug/debug_rp2040.cpp
index 6b54ac01181..8dc84a26732 100644
--- a/esphome/components/debug/debug_rp2040.cpp
+++ b/esphome/components/debug/debug_rp2040.cpp
@@ -41,15 +41,19 @@ const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFE
 #endif
 
   if (watchdog_caused_reboot()) {
+    bool handled = false;
 #ifdef USE_RP2040_CRASH_HANDLER
     if (rp2040::crash_handler_has_data()) {
       pos = buf_append_str(buf, size, pos, "Crash (HardFault)|");
-    } else
+      handled = true;
+    }
 #endif
-        if (watchdog_enable_caused_reboot()) {
-      pos = buf_append_str(buf, size, pos, "Watchdog timeout|");
-    } else {
-      pos = buf_append_str(buf, size, pos, "Software reset|");
+    if (!handled) {
+      if (watchdog_enable_caused_reboot()) {
+        pos = buf_append_str(buf, size, pos, "Watchdog timeout|");
+      } else {
+        pos = buf_append_str(buf, size, pos, "Software reset|");
+      }
     }
   }