From 27061bfca6164ba3da6e560ca7fb5ecefb65b3ff Mon Sep 17 00:00:00 2001 From: Mitch Bradley Date: Thu, 8 Oct 2020 09:13:52 -1000 Subject: [PATCH] Fixed WebUI crash (#633) While eliminating a redundant definition of is_realtime_command(), I inadvertently introduced a recursion due to the similarity of the names "is_realtime_command()" and "is_realtime_cmd()". The solution is to eliminate the latter entirely. --- Grbl_Esp32/src/WebUI/WebServer.cpp | 4 +--- Grbl_Esp32/src/WebUI/WebServer.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Grbl_Esp32/src/WebUI/WebServer.cpp b/Grbl_Esp32/src/WebUI/WebServer.cpp index 39d5067f..f9ef698d 100644 --- a/Grbl_Esp32/src/WebUI/WebServer.cpp +++ b/Grbl_Esp32/src/WebUI/WebServer.cpp @@ -430,8 +430,6 @@ namespace WebUI { } # endif - bool Web_Server::is_realtime_cmd(char c) { return is_realtime_cmd(c); } - void Web_Server::_handle_web_command(bool silent) { //to save time if already disconnected //if (_webserver->hasArg ("PAGEID") ) { @@ -501,7 +499,7 @@ namespace WebUI { } if (scmd.length() > 1) { scmd += "\n"; - } else if (!is_realtime_cmd(scmd[0])) { + } else if (!is_realtime_command(scmd[0])) { scmd += "\n"; } if (!Serial2Socket.push(scmd.c_str())) { diff --git a/Grbl_Esp32/src/WebUI/WebServer.h b/Grbl_Esp32/src/WebUI/WebServer.h index 9d8eca30..c4bd8745 100644 --- a/Grbl_Esp32/src/WebUI/WebServer.h +++ b/Grbl_Esp32/src/WebUI/WebServer.h @@ -87,7 +87,6 @@ namespace WebUI { static void handleFileList(); static void handleUpdate(); static void WebUpdateUpload(); - static bool is_realtime_cmd(char c); static void pushError(int code, const char* st, bool web_error = 500, uint16_t timeout = 1000); static void cancelUpload(); #ifdef ENABLE_SD_CARD