From a47e6f149615e318498707fd62e651ff9406bfbd Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Thu, 27 Mar 2025 21:08:32 +0100
Subject: [PATCH] Berry avoid bootloop when Berry is disabled (#23199)

---
 tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index cfc0b7573..821b90093 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -906,6 +906,7 @@ extern "C" bbool BerryBECLoader(const char * url) {
 bool Xdrv52(uint32_t function)
 {
   bool result = false;
+  if (berry.vm == NULL) { return result; }
 
   switch (function) {
     case FUNC_SLEEP_LOOP:
@@ -1029,7 +1030,7 @@ bool Xdrv52(uint32_t function)
     case FUNC_WEB_ADD_CONSOLE_BUTTON:
       if (XdrvMailbox.index) {
         XdrvMailbox.index++;
-      } else if (berry.vm != NULL) {
+      } else {
         WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
         HandleBerryBECLoaderButton();               // display buttons to load BEC files
         callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);