From 0f38a3553121e23ba21c41ebb277697efc7bbef4 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Mon, 6 Sep 2021 12:26:20 -0700
Subject: [PATCH] Be sure to stop the timer when triggering d-click

Some mice apparently trigger double-click without triggering a click, so
stop the timer when we receive this event

Fixes https://gitlab.com/kicad/code/kicad/issues/9106
---
 eeschema/tools/ee_selection_tool.cpp | 2 ++
 pcbnew/tools/pcb_selection_tool.cpp  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index b444bb1343..4425ff3de5 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -481,6 +481,8 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
         }
         else if( evt->IsDblClick( BUT_LEFT ) )
         {
+            m_disambiguateTimer.Stop();
+
             // double click? Display the properties window
             if( SCH_EDIT_FRAME* schframe = dynamic_cast<SCH_EDIT_FRAME*>( m_frame ) )
                 schframe->FocusOnItem( nullptr );
diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index 2adbe76861..5f84cfec33 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -304,6 +304,8 @@ int PCB_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
         }
         else if( evt->IsDblClick( BUT_LEFT ) )
         {
+            m_disambiguateTimer.Stop();
+
             // Double click? Display the properties window
             m_frame->FocusOnItem( nullptr );