Fix a crash and add more safety checks to catch NULL pointers

(bzr r9713)

1 files changed, 7 insertions, 0 deletions

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 4c8cc74d8..f6fb6cc54 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -966,6 +966,11 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             }
         }
         sm.setupIgnoreSelection(_desktop, true, &unselected);
+    } else {
+        // even if we won't really snap, we might still call the one of the
+        // constrainedSnap() methods to enforce the constraints, so we need
+        // to setup the snapmanager anyway
+        sm.setup(_desktop);
     }
 
     if (held_control(*event)) {
@@ -1029,6 +1034,8 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
         new_pos = sp.getPoint();
     }
 
+    sm.unSetup();
+
     SelectableControlPoint::dragged(new_pos, event);
 }