X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIMerger.java;h=3f5c2542a44b3c42dc4d321ae55ced75c5079c1e;hb=2f36a21b44c0559fb125765d4b376aba4af6d5b9;hp=fc1743b1676a000b40cc8460e91674fc706864a0;hpb=41c5ae2a1218973a12df311add1bf1366e09797c;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index fc1743b1..3f5c2542 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@ -20,12 +20,12 @@ import net.mograsim.preferences.Preferences;
 
 public class GUIMerger extends GUIComponent
 {
-	private static final double width = 20;
+	private static final double width = 10;
 	private static final double heightPerPin = 10;
 
 	public final int logicWidth;
 
-	private ReadEnd[] inputEnds;
+	private final ReadEnd[] inputEnds;
 	private ReadEnd outputEnd;
 
 	public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
@@ -37,6 +37,7 @@ public class GUIMerger extends GUIComponent
 		for (int i = 0; i < logicWidth; i++, inputHeight += 10)
 			addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
 		addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));
+		inputEnds = new ReadEnd[logicWidth];
 	}
 
 	@Override
@@ -69,7 +70,7 @@ public class GUIMerger extends GUIComponent
 
 	public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
 	{
-		this.inputEnds = inputEnds;
+		System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);
 		this.outputEnd = outputEnd;
 	}