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

Fix an insidious bug where DoDelete() and DeleteJunction() were fighting over who owned the STRUCT_DELETED flag. 

Fixes: lp:1844620
* https://bugs.launchpad.net/kicad/+bug/1844620
This commit is contained in:
Jeff Young 2019-09-19 19:10:32 +01:00
parent 37f06eb2b7
commit 33606431cc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/bus-wire-junction.cpp
View File

@ -341,13 +341,13 @@ bool SCH_EDIT_FRAME::BreakSegmentsOnJunctions( SCH_SCREEN* aScreen )
void SCH_EDIT_FRAME::DeleteJunction( SCH_ITEM* aJunction, bool aAppend ) void SCH_EDIT_FRAME::DeleteJunction( SCH_ITEM* aJunction, bool aAppend )
{ {
SCH_SCREEN* screen = GetScreen(); SCH_SCREEN* screen = GetScreen();
PICKED_ITEMS_LIST itemList; PICKED_ITEMS_LIST undoList;
EE_SELECTION_TOOL* selectionTool = m_toolManager->GetTool<EE_SELECTION_TOOL>(); EE_SELECTION_TOOL* selectionTool = m_toolManager->GetTool<EE_SELECTION_TOOL>();
auto remove_item = [ & ]( SCH_ITEM* aItem ) -> void auto remove_item = [ & ]( SCH_ITEM* aItem ) -> void
{ {
aItem->SetFlags( STRUCT_DELETED ); aItem->SetFlags( STRUCT_DELETED );
itemList.PushItem( ITEM_PICKER( aItem, UR_DELETED ) ); undoList.PushItem( ITEM_PICKER( aItem, UR_DELETED ) );
}; };
remove_item( aJunction ); remove_item( aJunction );
@ -383,7 +383,7 @@ void SCH_EDIT_FRAME::DeleteJunction( SCH_ITEM* aJunction, bool aAppend )
{ {
remove_item( item ); remove_item( item );
remove_item( secondItem ); remove_item( secondItem );
itemList.PushItem( ITEM_PICKER( line, UR_NEW ) ); undoList.PushItem( ITEM_PICKER( line, UR_NEW ) );
AddToScreen( line ); AddToScreen( line );
@ -395,12 +395,11 @@ void SCH_EDIT_FRAME::DeleteJunction( SCH_ITEM* aJunction, bool aAppend )
} }
} }
SaveCopyInUndoList( itemList, UR_DELETED, aAppend ); SaveCopyInUndoList( undoList, UR_DELETED, aAppend );
SCH_ITEM* nextitem; for( unsigned ii = 0; ii < undoList.GetCount(); ii++ )
for( SCH_ITEM* item = screen->GetDrawItems(); item; item = nextitem )
{ {
nextitem = item->Next(); EDA_ITEM* item = undoList.GetPickedItem( ii );
if( item->GetEditFlags() & STRUCT_DELETED ) if( item->GetEditFlags() & STRUCT_DELETED )
{ {