electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix COMMIT::Stage assertion when CHT_DONE set on CHT_MODIFY

Browse Source 
When undoLevelItem() remaps a child item to its parent, the change type
is forced to CHT_MODIFY but the CHT_DONE flag from the original
CHT_ADD/CHT_REMOVE was left intact. CHT_DONE means the original
add/remove was already applied to the child, but that semantic doesn't
carry over when we remap to a modify of the parent.

Strip CHT_DONE at the remapping site instead of as a general catch-all.
Keep the assertion as defense-in-depth for any future code path that
might combine CHT_MODIFY with CHT_DONE directly.

Fixes KICAD-102A
This commit is contained in:
Seth Hillbrand
2026-02-16 11:07:56 -08:00
parent 0fbf9edecd
commit a44ac7d29b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/commit.cpp
+7 -3
View File
@@ -50,11 +50,15 @@ COMMIT& COMMIT::Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType, BASE_SCREEN* aS
EDA_ITEM* undoItem = undoLevelItem( aItem );
if( undoItem != aItem )
{
changeType = CHT_MODIFY;
// CHT_MODIFY and CHT_DONE are not compatible
if( changeType == CHT_MODIFY )
wxASSERT( ( flags & CHT_DONE ) == 0 );
// CHT_DONE means the original add/remove was already applied to the child, but that
// semantic doesn't carry over when we remap to a modify of the parent
flags &= ~CHT_DONE;
}
wxASSERT( changeType != CHT_MODIFY || ( flags & CHT_DONE ) == 0 );
switch( changeType )
{