realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't leak PCB_GROUP internals into BOARD_COMMIT.

Browse Source 
(This also fixes a potential bug where the image
group's children didn't get the image as a parent.)
This commit is contained in:
Jeff Young 2025-04-21 18:24:30 +01:00
parent c1b1c689ad
commit 199a7a34ea
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/board_commit.cpp
View File

@ -751,16 +751,6 @@ void BOARD_COMMIT::Revert()
BOARD_ITEM* boardItemCopy = static_cast<BOARD_ITEM*>( entry.m_copy );
boardItem->SwapItemData( boardItemCopy );
if( PCB_GROUP* group = dynamic_cast<PCB_GROUP*>( boardItem ) )
{
group->RunOnChildren(
[&]( BOARD_ITEM* child )
{
child->SetParentGroup( group );
},
RECURSE_MODE::NO_RECURSE );
}
view->Add( boardItem );
connectivity->Add( boardItem );
itemsChanged.push_back( boardItem );

17
pcbnew/pcb_group.cpp
View File

@ -264,8 +264,23 @@ PCB_GROUP* PCB_GROUP::DeepDuplicate() const
void PCB_GROUP::swapData( BOARD_ITEM* aImage )
{
assert( aImage->Type() == PCB_GROUP_T );
PCB_GROUP* image = static_cast<PCB_GROUP*>( aImage );
std::swap( *( (PCB_GROUP*) this ), *( (PCB_GROUP*) aImage ) );
std::swap( *this, *image );
RunOnChildren(
[&]( BOARD_ITEM* child )
{
child->SetParentGroup( this );
},
RECURSE_MODE::NO_RECURSE );
image->RunOnChildren(
[&]( BOARD_ITEM* child )
{
child->SetParentGroup( image );
},
RECURSE_MODE::NO_RECURSE );
}