Do not try to construct an ustring from NULL in CurveDragPoint::_getTip.

[inkscape.git] / src / ui / tool / control-point.cpp

diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 0d076a5ab2ce3fcc0bd6621128a0a71e6590c77d..941924e0a73041324021e5712df03d1170d397c7 100644 (file)
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -355,7 +355,7 @@ void ControlPoint::_setPixbuf(Glib::RefPtr<Gdk::Pixbuf> p)
 }
 
 // re-routes events into the virtual function
-int ControlPoint::_event_handler(SPCanvasItem *item, GdkEvent *event, ControlPoint *point)
+int ControlPoint::_event_handler(SPCanvasItem */*item*/, GdkEvent *event, ControlPoint *point)
 {
     return point->_eventHandler(event) ? TRUE : FALSE;
 }
@@ -438,8 +438,8 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
     case GDK_BUTTON_RELEASE:
         if (!_event_grab) break;
 
-        // TODO I think this "feature" is wrong.
-        // sp_event_context_snap_watchdog_callback(_desktop->event_context->_delayed_snap_event);
+        // TODO I think snapping on release is wrong, or at least counter-intuitive.
+        sp_event_context_snap_watchdog_callback(_desktop->event_context->_delayed_snap_event);
         sp_event_context_discard_delayed_snap_event(_desktop->event_context);
         _desktop->snapindicator->remove_snaptarget();