Queued realtime characters were being ignored when not idle

bdring · Jan 19, 2024 · ade2550 · ade2550
1 parent 674b0df
commit ade2550
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/FluidNC/src/Channel.cpp b/FluidNC/src/Channel.cpp
@@ -139,11 +139,11 @@ void Channel::pin_event(uint32_t pinnum, bool active) {
 Channel* Channel::pollLine(char* line) {
     handle();
     while (1) {
-        int ch;
-        if (line && _queue.size()) {
+        int ch = -1;
+        if (_queue.size()) {
             ch = _queue.front();
             _queue.pop();
-        } else {
+        } else if (line) {
             ch = read();
         }
 

diff --git a/FluidNC/src/WebUI/WSChannel.cpp b/FluidNC/src/WebUI/WSChannel.cpp
@@ -84,8 +84,8 @@ namespace WebUI {
             return false;
         }
         char c;
-        while ((c = *data++) != '\0') {
-            _queue.push(c);
+        while (length--) {
+            _queue.push(*data++);
         }
         return true;
     }