From 6f0c6f946cb6c604484d30cee3675e0486a88162 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 7 Sep 2018 22:35:25 +0100
Subject: [PATCH] Fixup some more cursor issues.

---
 eeschema/controle.cpp           | 2 --
 eeschema/libedit/controller.cpp | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index ac8c868927..0d3e6768d8 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -249,10 +249,8 @@ bool SCH_EDIT_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KE
         snapToGrid = true;
 
     wxPoint pos = aPosition;
-    wxPoint oldpos = GetCrossHairPosition();
     bool keyHandled = GeneralControlKeyMovement( aHotKey, &pos, snapToGrid );
 
-    // Update cursor position.
     if( GetToolId() == ID_NO_TOOL_SELECTED )
         m_canvas->CrossHairOff( aDC );
     else
diff --git a/eeschema/libedit/controller.cpp b/eeschema/libedit/controller.cpp
index ec767b0797..8164e562d4 100644
--- a/eeschema/libedit/controller.cpp
+++ b/eeschema/libedit/controller.cpp
@@ -66,17 +66,15 @@ bool LIB_EDIT_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KE
         snapToGrid = true;
 
     wxPoint pos = aPosition;
-    wxPoint oldpos = GetCrossHairPosition();
     bool keyHandled = GeneralControlKeyMovement( aHotKey, &pos, snapToGrid );
 
-    // Update the cursor position.
     SetCrossHairPosition( pos, snapToGrid );
-    RefreshCrossHair( oldpos, aPosition, aDC );
+
+    if( m_canvas->IsMouseCaptured() )
+        m_canvas->CallMouseCapture( aDC, aPosition, true );
 
     if( aHotKey && OnHotKey( aDC, aHotKey, aPosition, NULL ) )
-    {
         keyHandled = true;
-    }
 
     // Make sure current-part highlighting doesn't get lost in seleciton highlighting
     ClearSearchTreeSelection();