luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

One more change to the "extresist" code which prevents extresist 

from substituting a regular label for a port during a node merge,
which can cause ports to become orphaned.
This commit is contained in:
Tim Edwards 2023-11-27 16:18:43 -05:00
parent 84af801608
commit 83ed73ac52
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.451
8.3.452

14
resis/ResMerge.c
View File

@ -743,7 +743,19 @@ ResMergeNodes(node1, node2, pendingList, doneList)
}
/* Moves name to new node, if new node does not have a name */
if (node1->rn_name == NULL) node1->rn_name = node2->rn_name;
if (node1->rn_name == NULL)
node1->rn_name = node2->rn_name;
else if ((node2->rn_name != NULL) && (node2->rn_name != node1->rn_name))
{
HashEntry *entry;
ResSimNode *node;
/* Check if node2 is a port */
entry = HashFind(&ResNodeTable, node2->rn_name);
node = (ResSimNode *)HashGetValue(entry);
if (node && (node->status & PORTNODE))
node1->rn_name = node2->rn_name;
}
/* Moves resistors to new node */