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

eeschema: Don't trust the pointer 

We are not guaranteed a selection.  Keep pointers to the front items
guarded.  This can happen after repeating a new item, e.g.
This commit is contained in:
Seth Hillbrand 2019-07-17 18:21:36 -07:00
parent b877d17138
commit 5324b65fb0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/tools/sch_move_tool.cpp
View File

@ -44,6 +44,7 @@
SCH_MOVE_TOOL::SCH_MOVE_TOOL() : SCH_MOVE_TOOL::SCH_MOVE_TOOL() :
EE_TOOL_BASE<SCH_EDIT_FRAME>( "eeschema.InteractiveMove" ), EE_TOOL_BASE<SCH_EDIT_FRAME>( "eeschema.InteractiveMove" ),
m_moveInProgress( false ), m_moveInProgress( false ),
m_isDragOperation( false ),
m_moveOffset( 0, 0 ) m_moveOffset( 0, 0 )
{ {
} }
@ -124,7 +125,9 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
if( m_moveInProgress ) if( m_moveInProgress )
{ {
if( !m_selectionTool->GetSelection().Front()->IsNew() ) auto sel = m_selectionTool->GetSelection().Front();
if( sel && !sel->IsNew() )
{ {
// User must have switched from move to drag or vice-versa. Reset the selected // User must have switched from move to drag or vice-versa. Reset the selected
// items so we can start again with the current m_isDragOperation. // items so we can start again with the current m_isDragOperation.
@ -174,7 +177,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
if( !m_moveInProgress ) // Prepare to start moving/dragging if( !m_moveInProgress ) // Prepare to start moving/dragging
{ {
SCH_ITEM* sch_item = (SCH_ITEM*) selection.Front(); SCH_ITEM* sch_item = (SCH_ITEM*) selection.Front();
bool appendUndo = sch_item->IsNew(); bool appendUndo = sch_item && sch_item->IsNew();
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Setup a drag or a move // Setup a drag or a move