From 671aec5da61a3a4b22409c473539b27ba004af28 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 23 Sep 2021 11:46:07 -0700 Subject: [PATCH] In fallback selection, handle cancelled menu doSelectionMenu returns false to indicate a cancelled menu. This needs to be handled in selectPoint when directly accessing doSelectionMenu in the same manner as SelectionMenu() events Fixes https://gitlab.com/kicad/code/kicad/issues/9218 --- eeschema/tools/ee_selection_tool.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp index 41b5b67930..1c5b80c4c2 100644 --- a/eeschema/tools/ee_selection_tool.cpp +++ b/eeschema/tools/ee_selection_tool.cpp @@ -858,7 +858,10 @@ bool EE_SELECTION_TOOL::selectPoint( EE_COLLECTOR& aCollector, EDA_ITEM** aItem, // But it we cannot handle the event, then we don't have an active tool loop, so // handle it directly. if( !m_toolMgr->RunAction( EE_ACTIONS::selectionMenu, true, &aCollector ) ) - doSelectionMenu( &aCollector ); + { + if( !doSelectionMenu( &aCollector ) ) + aCollector.m_MenuCancelled = true; + } if( aCollector.m_MenuCancelled ) {