X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionTable.java;h=936ba5c49a1b4bc69439c45d6f08dfe0db7a80ba;hp=d598c3ff4477313be094cf2be94a7a110072e9af;hb=363c9377b3c542c87fc5e7f57674751439246dbd;hpb=3073cf643c4fe249547bb2a7ff22e89f0827c9ae

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
index d598c3ff..936ba5c4 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
@@ -107,8 +107,11 @@ public class InstructionTable
 	public void bindMicroInstructionMemory(MicroInstructionMemory memory)
 	{
 		this.memory = memory;
-		this.miDef = memory.getDefinition().getMicroInstructionDefinition();
-		setViewerInput(memory);
+		if (memory != null)
+		{
+			this.miDef = memory.getDefinition().getMicroInstructionDefinition();
+			setViewerInput(memory);
+		}
 	}
 
 	private static final String[] HEX_DIGITS = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" };