projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed stupid bug causing submodules not to work
[Mograsim.git]
/
net.mograsim.logic.ui
/
src
/
net
/
mograsim
/
logic
/
ui
/
modeladapter
/
ViewLogicModelAdapter.java
diff --git
a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index
80c2898
..
09cd6cb
100644
(file)
--- a/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/
net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@
-115,7
+115,7
@@
public class ViewLogicModelAdapter
else
throw new IllegalArgumentException("Two pins to external wires can't be connected directly");
}
else
throw new IllegalArgumentException("Two pins to external wires can't be connected directly");
}
- return
new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime)
;
+ return
externalWire == null ? new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire
;
}));
return logicWiresPerPin;
}
}));
return logicWiresPerPin;
}