From 0105338e29d4e67a48cf444e569ce35872c18c18 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Tue, 6 Aug 2024 14:17:53 +0200 Subject: [PATCH] do not close local shell #1926 --- lib/uuid-console/src/shell.cpp | 2 +- lib/uuid-console/src/uuid/console.h | 2 ++ src/console.h | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/uuid-console/src/shell.cpp b/lib/uuid-console/src/shell.cpp index 8005913c1..771806065 100644 --- a/lib/uuid-console/src/shell.cpp +++ b/lib/uuid-console/src/shell.cpp @@ -85,7 +85,7 @@ void Shell::stop() { blocking_data->stop_ = true; } else { - if (running()) { + if (running() && !has_flags(CommandFlags::LOCAL)) { // do not close local shell stopped_ = true; stopped(); } diff --git a/lib/uuid-console/src/uuid/console.h b/lib/uuid-console/src/uuid/console.h index d3c565bd2..e8f54d79e 100644 --- a/lib/uuid-console/src/uuid/console.h +++ b/lib/uuid-console/src/uuid/console.h @@ -55,6 +55,8 @@ #include #endif +enum CommandFlags : uint8_t { USER = 0, ADMIN = (1 << 0), LOCAL = (1 << 1) }; + namespace uuid { /** diff --git a/src/console.h b/src/console.h index a8e7eeaae..01b48e4ce 100644 --- a/src/console.h +++ b/src/console.h @@ -32,8 +32,6 @@ namespace emsesp { -enum CommandFlags : uint8_t { USER = 0, ADMIN = (1 << 0), LOCAL = (1 << 1) }; - enum ShellContext : uint8_t { MAIN = 0, SYSTEM, END }; class EMSESP;