From ce656ef7c686d0aaa60ad540f11f45826bd127fe Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sat, 11 Jun 2016 22:26:36 +0000
Subject: [PATCH] Fix disabling of autoconstrainter via Ctrl.

---
 src/mouse.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mouse.cpp b/src/mouse.cpp
index d013d4e..f41f2e1 100644
--- a/src/mouse.cpp
+++ b/src/mouse.cpp
@@ -892,6 +892,9 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
         if(ToolbarMouseDown((int)mx, (int)my)) return;
     }
 
+    // This will be clobbered by MouseMoved below.
+    SuggestedConstraint constraintSuggestion = SS.GW.pending.suggestion;
+
     // Make sure the hover is up to date.
     MouseMoved(mx, my, false, false, false, false, false);
     orig.mouse.x = mx;
@@ -1127,8 +1130,8 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
 
         case DRAGGING_NEW_LINE_POINT: {
             // Constrain the line segment horizontal or vertical if close enough
-            if(SS.GW.pending.suggestion != SUGGESTED_NONE) {
-                Constraint::Constrain(SS.GW.pending.suggestion,
+            if(constraintSuggestion != SUGGESTED_NONE) {
+                Constraint::Constrain(constraintSuggestion,
                     Entity::NO_ENTITY, Entity::NO_ENTITY, pending.request.entity(0));
             }