haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow activation of other tools in the middle of a move. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8116
This commit is contained in:
Jeff Young 2021-05-08 20:49:09 +01:00
parent b4b59c3b33
commit b78ba12739
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/tools/sch_move_tool.cpp
View File

@ -364,11 +364,25 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
//
else if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_moveInProgress && evt->IsCancelInteractive() )
evt->SetPassEvent( false );
if( m_moveInProgress )
{
if( evt->IsActivate() )
{
// Allowing other tools to activate during a move runs the risk of race
// conditions in which we try to spool up both event loops at once.
if( m_isDrag )
m_frame->ShowInfoBarMsg( _( "Press <ESC> to cancel drag." ) );
else
m_frame->ShowInfoBarMsg( _( "Press <ESC> to cancel move." ) );
evt->SetPassEvent( false );
continue;
}
evt->SetPassEvent( false );
restore_state = true;
}
break;
}
@ -391,7 +405,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
if( selection.Front()->IsNew() )
{
// This doesn't really make sense; we'll just end up dragging a stack of
// objects so Duplicate() is going to ignore this and we'll just carry on.
// objects so we ignore the duplicate and just carry on.
continue;
}