diff --git a/src/node-context.cpp b/src/node-context.cpp
index 0008181613a98343c2081641f889ac557bbd3ade..352bac58465b917cb3d2166f8419e761f5109e9b 100644 (file)
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -275,7 +275,6 @@ sp_node_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEve
bool over_stroke = nc->shape_editor->is_over_stroke(NR::Point(event->button.x, event->button.y), true);
//only dragging curves
if (over_stroke) {
- nc->shape_editor->select_segment_near_point(false);
ret = TRUE;
} else {
break;
if (nc->shape_editor->hits_curve() && !event_context->within_tolerance) { //drag curve
nc->shape_editor->finish_drag();
- } else if (b != NR::Nothing() && !event_context->within_tolerance) { // drag to select
- nc->shape_editor->select_rect(b.assume(), event->button.state & GDK_SHIFT_MASK);
+ } else if (b && !event_context->within_tolerance) { // drag to select
+ nc->shape_editor->select_rect(*b, event->button.state & GDK_SHIFT_MASK);
} else {
if (!(nc->rb_escaped)) { // unless something was cancelled
if (nc->shape_editor->has_selection())
case GDK_Escape:
{
NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
- if (b != NR::Nothing()) {
+ if (b) {
Inkscape::Rubberband::get()->stop();
nc->current_state = SP_NODE_CONTEXT_INACTIVE;
nc->rb_escaped = true;