From 3ea070d548ff526afe3a86ef6835146773aac020 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sun, 2 Jul 2017 01:27:16 +0200
Subject: Improving CR feedback. thanks!

---
 src/ui/tools/tool-base.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/ui/tools/tool-base.cpp')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index ddd7c19c4..457d704aa 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -328,13 +328,16 @@ bool ToolBase::_keyboardMove(GdkEventKey const &event, Geom::Point const &dir)
         if (knotholder) {
             knotholder->transform_selected(Geom::Translate(delta));
         }
-    } else {
+    } else if (tools_isactive(desktop, TOOLS_NODES)) {
         Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(desktop->event_context);
         if (nt) {
             for(auto i=nt->_shape_editors.begin();i!=nt->_shape_editors.end();++i){
-                KnotHolder * knotholder = i->second->knotholder;
-                if (knotholder) {
-                    knotholder->transform_selected(Geom::Translate(delta));
+                ShapeEditor * shape_editor = i->second;
+                if (shape_editor && shape_editor->has_knotholder()) {
+                    KnotHolder * knotholder = shape_editor->knotholder;
+                    if (knotholder) {
+                        knotholder->transform_selected(Geom::Translate(delta));
+                    }
                 }
             }
         }
-- 
cgit v1.2.3