mirror of
https://github.com/holub/mame
synced 2025-07-03 17:08:39 +03:00
Allow connecting a net to itself, fixed typo and be more explicit on error.
This commit is contained in:
parent
1500978953
commit
6e59e28996
@ -614,8 +614,14 @@ ATTR_COLD void netlist_net_t::merge_net(netlist_net_t *othernet)
|
|||||||
if (othernet == NULL)
|
if (othernet == NULL)
|
||||||
return; // Nothing to do
|
return; // Nothing to do
|
||||||
|
|
||||||
|
if (othernet == this)
|
||||||
|
{
|
||||||
|
netlist().warning("Connecting %s to itself. This may be right, though\n", this->name().cstr());
|
||||||
|
return; // Nothing to do
|
||||||
|
}
|
||||||
|
|
||||||
if (this->isRailNet() && othernet->isRailNet())
|
if (this->isRailNet() && othernet->isRailNet())
|
||||||
netlist().error("Trying to merge to rail nets\n");
|
netlist().error("Trying to merge two rail nets: %s and %s\n", this->name().cstr(), othernet->name().cstr());
|
||||||
|
|
||||||
if (othernet->isRailNet())
|
if (othernet->isRailNet())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user