mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-18 04:11:53 +02:00
Code Issues Releases Wiki Activity

Fixed WebUI crash (#633)

Browse Source 
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.
This commit is contained in:
Mitch Bradley
2020-10-08 09:13:52 -10:00
committed by GitHub
parent 994de40724
commit 27061bfca6
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Grbl_Esp32/src/WebUI/WebServer.cpp
View File

@@ -430,8 +430,6 @@ namespace WebUI {
} }
# endif # endif
bool Web_Server::is_realtime_cmd(char c) { return is_realtime_cmd(c); }
void Web_Server::_handle_web_command(bool silent) { void Web_Server::_handle_web_command(bool silent) {
//to save time if already disconnected //to save time if already disconnected
//if (_webserver->hasArg ("PAGEID") ) { //if (_webserver->hasArg ("PAGEID") ) {
@@ -501,7 +499,7 @@ namespace WebUI {
} }
if (scmd.length() > 1) { if (scmd.length() > 1) {
scmd += "\n"; scmd += "\n";
} else if (!is_realtime_cmd(scmd[0])) { } else if (!is_realtime_command(scmd[0])) {
scmd += "\n"; scmd += "\n";
} }
if (!Serial2Socket.push(scmd.c_str())) { if (!Serial2Socket.push(scmd.c_str())) {

1
Grbl_Esp32/src/WebUI/WebServer.h
View File

@@ -87,7 +87,6 @@ namespace WebUI {
static void handleFileList(); static void handleFileList();
static void handleUpdate(); static void handleUpdate();
static void WebUpdateUpload(); 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 pushError(int code, const char* st, bool web_error = 500, uint16_t timeout = 1000);
static void cancelUpload(); static void cancelUpload();
#ifdef ENABLE_SD_CARD #ifdef ENABLE_SD_CARD