TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-10-03 01:41:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed an error if nets in nested circuits are merged via a direct nested connection

Browse Source
This commit is contained in:
hneemann 2017-04-07 13:01:29 +02:00
parent ad6e26fa80
commit f15f2bc788
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/neemann/digital/draw/model/Net.java
View File

@ -121,6 +121,7 @@ public class Net {
*/ */
public void addNet(Net otherNet) { public void addNet(Net otherNet) {
pins.addAll(otherNet.getPins()); pins.addAll(otherNet.getPins());
if (wires != null && otherNet.getWires() != null)
wires.addAll(otherNet.getWires()); wires.addAll(otherNet.getWires());
labelSet.addAll(otherNet.labelSet); labelSet.addAll(otherNet.labelSet);
} }