Merge branch 'master' into develop
This commit is contained in:
commit
b37ba9f2f1
|
@ -226,14 +226,13 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (childNode != null) {
|
if (childNode == null) {
|
||||||
node = childNode;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
HierNode newNode = new HierNode(name, node);
|
HierNode newNode = new HierNode(name, node);
|
||||||
node.addChild(newNode);
|
node.addChild(newNode);
|
||||||
node = newNode;
|
node = newNode;
|
||||||
|
} else {
|
||||||
|
node = childNode;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
node.addChild(waveform);
|
node.addChild(waveform);
|
||||||
waveform.setParent(node);
|
waveform.setParent(node);
|
||||||
|
|
Loading…
Reference in New Issue