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 double-delete unused nets (or anything else, for that matter).

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/15979
This commit is contained in:
Jeff Young 2023-10-31 10:59:11 +00:00
parent 3d5721a217
commit e7fca68384
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/commit.cpp
View File

@ -61,6 +61,9 @@ COMMIT& COMMIT::Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType, BASE_SCREEN* aS
return *this; return *this;
case CHT_REMOVE: case CHT_REMOVE:
wxASSERT_MSG( m_deletedItems.find( aItem ) == m_deletedItems.end(),
wxT( "Item already staged for deletion" ) );
m_deletedItems.insert( aItem );
makeEntry( aItem, CHT_REMOVE | flag, nullptr, aScreen ); makeEntry( aItem, CHT_REMOVE | flag, nullptr, aScreen );
return *this; return *this;
@ -133,9 +136,8 @@ int COMMIT::GetStatus( EDA_ITEM* aItem, BASE_SCREEN *aScreen )
COMMIT& COMMIT::createModified( EDA_ITEM* aItem, EDA_ITEM* aCopy, int aExtraFlags, BASE_SCREEN* aScreen ) COMMIT& COMMIT::createModified( EDA_ITEM* aItem, EDA_ITEM* aCopy, int aExtraFlags, BASE_SCREEN* aScreen )
{ {
EDA_ITEM* parent = parentObject( aItem ); EDA_ITEM* parent = parentObject( aItem );
auto entryIt = m_changedItems.find( parent );
if( entryIt != m_changedItems.end() ) if( m_changedItems.find( parent ) != m_changedItems.end() )
{ {
delete aCopy; delete aCopy;
return *this; // item has been already modified once return *this; // item has been already modified once

2
include/commit.h
View File

@ -163,6 +163,7 @@ protected:
void clear() void clear()
{ {
m_changedItems.clear(); m_changedItems.clear();
m_deletedItems.clear();
m_changes.clear(); m_changes.clear();
} }
@ -188,6 +189,7 @@ protected:
protected: protected:
std::set<EDA_ITEM*> m_changedItems; std::set<EDA_ITEM*> m_changedItems;
std::set<EDA_ITEM*> m_deletedItems;
std::vector<COMMIT_LINE> m_changes; std::vector<COMMIT_LINE> m_changes;
}; };

11
pcbnew/netlist_reader/board_netlist_updater.cpp
View File

@ -638,7 +638,7 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( FOOTPRINT* aFootprint
// Create a copy only if the footprint has not been added during this update // Create a copy only if the footprint has not been added during this update
FOOTPRINT* copy = nullptr; FOOTPRINT* copy = nullptr;
if( !m_commit.GetStatus( aFootprint ) ) if( !m_isDryRun && !m_commit.GetStatus( aFootprint ) )
{ {
copy = static_cast<FOOTPRINT*>( aFootprint->Clone() ); copy = static_cast<FOOTPRINT*>( aFootprint->Clone() );
copy->SetParentGroup( nullptr ); copy->SetParentGroup( nullptr );
@ -650,9 +650,11 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( FOOTPRINT* aFootprint
PADS pads = aFootprint->Pads(); PADS pads = aFootprint->Pads();
std::set<wxString> padNetnames; std::set<wxString> padNetnames;
std::sort( pads.begin(), pads.end(), []( PAD* a, PAD* b ) { std::sort( pads.begin(), pads.end(),
return a->m_Uuid < b->m_Uuid; []( PAD* a, PAD* b )
} ); {
return a->m_Uuid < b->m_Uuid;
} );
for( PAD* pad : pads ) for( PAD* pad : pads )
{ {
@ -1273,7 +1275,6 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
{ {
msg.Printf( _( "Removed unused net %s." ), net->GetNetname() ); msg.Printf( _( "Removed unused net %s." ), net->GetNetname() );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
m_commit.Removed( net );
} }
} }