mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Berry avoid crash when Berry is disabled after bootloop (#21235)

This commit is contained in:
s-hadinger 2024-04-21 10:03:55 +02:00 committed by GitHub
parent c4431eb6fe
commit 5ecd45e2da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
View File

@ -782,6 +782,7 @@ void HandleBerryConsole(void)
// Display Buttons to dynamically load bec files // Display Buttons to dynamically load bec files
void HandleBerryBECLoaderButton(void) { void HandleBerryBECLoaderButton(void) {
bvm * vm = berry.vm; bvm * vm = berry.vm;
if (vm == NULL) { return; } // Berry vm is not initialized
for (int32_t i = 0; i < ARRAY_SIZE(BECCode); i++) { for (int32_t i = 0; i < ARRAY_SIZE(BECCode); i++) {
const BeBECCode_t &bec = BECCode[i]; const BeBECCode_t &bec = BECCode[i];
@ -946,7 +947,7 @@ bool Xdrv52(uint32_t function)
case FUNC_WEB_ADD_CONSOLE_BUTTON: case FUNC_WEB_ADD_CONSOLE_BUTTON:
if (XdrvMailbox.index) { if (XdrvMailbox.index) {
XdrvMailbox.index++; XdrvMailbox.index++;
} else { } else if (berry.vm != NULL) {
WSContentSend_P(HTTP_BTN_BERRY_CONSOLE); WSContentSend_P(HTTP_BTN_BERRY_CONSOLE);
HandleBerryBECLoaderButton(); // display buttons to load BEC files HandleBerryBECLoaderButton(); // display buttons to load BEC files
callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr); callBerryEventDispatcher(PSTR("web_add_button"), nullptr, 0, nullptr);