From 4acff3f66face058f7ac4aa962fa70558bc70f0f Mon Sep 17 00:00:00 2001
From: Paddle <PaddleStroke@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:27:50 +0100
Subject: [PATCH] Sketcher: polyline: fix ESC exit tool

---
 src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h
index 299f196d96..54a9fce65b 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h
@@ -98,11 +98,8 @@ public:
 
     void registerPressedKey(bool pressed, int key) override
     {
-        if (Mode != STATUS_SEEK_Second) {
-            return;  // SegmentMode can be changed only in STATUS_SEEK_Second mode
-        }
-
-        if (key == SoKeyboardEvent::M && pressed && previousCurve != -1) {
+        if (Mode == STATUS_SEEK_Second && key == SoKeyboardEvent::M && pressed
+            && previousCurve != -1) {
             // loop through the following modes:
             // SEGMENT_MODE_Line, TRANSITION_MODE_Free / TRANSITION_MODE_Tangent
             // SEGMENT_MODE_Line, TRANSITION_MODE_Perpendicular_L
@@ -184,6 +181,9 @@ public:
             }
             mouseMove(onSketchPos);  // trigger an update of EditCurve
         }
+        else {
+            DrawSketchHandler::registerPressedKey(pressed, key);
+        }
     }
 
     void mouseMove(Base::Vector2d onSketchPos) override