diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp index fe29dbb544..a968713c45 100644 --- a/pcbnew/tools/pcb_selection_tool.cpp +++ b/pcbnew/tools/pcb_selection_tool.cpp @@ -45,6 +45,7 @@ using namespace std::placeholders; #include #include #include +#include #include #include #include @@ -282,9 +283,15 @@ int PCB_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent ) bool modifier_enabled = m_subtractive || m_additive || m_exclusive_or; PCB_BASE_FRAME* frame = getEditFrame(); bool brd_editor = frame && frame->IsType( FRAME_PCB_EDITOR ); + ROUTER_TOOL* router = m_toolMgr->GetTool(); + // If the router tool is active, don't override + if( router && router->IsToolActive() ) + { + evt->SetPassEvent(); + } // Single click? Select single object - if( evt->IsClick( BUT_LEFT ) ) + else if( evt->IsClick( BUT_LEFT ) ) { if( highlight_modifier && brd_editor ) m_toolMgr->RunAction( PCB_ACTIONS::highlightNet, true );