From 6a0d59b0c19aae0f38e390092b1627e8e36c839b Mon Sep 17 00:00:00 2001
From: Amon Sha <amon.sha@gmail.com>
Date: Fri, 23 Jan 2026 16:18:25 +0200
Subject: [PATCH] Merge pull request #27077 from
 amon-sha/fix_sketcher_autoscale_segfault

Sketcher: fix segfault during autoscale
---
 src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h
index a0d2baf19e..bb1cc9816c 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerScale.h
@@ -536,6 +536,10 @@ private:
                     newConstr->First = firstIndex;
                     newConstr->Second = secondIndex;
                 }
+                else if (cstr->Type == Angle && firstIndex != GeoEnum::GeoUndef
+                         && secondIndex == GeoEnum::GeoUndef && thirdIndex == GeoEnum::GeoUndef) {
+                    newConstr->First = firstIndex;
+                }
                 else if ((cstr->Type == Radius || cstr->Type == Diameter)
                          && firstIndex != GeoEnum::GeoUndef) {
                     newConstr->First = firstIndex;