Merge branch 'development' of

[Mograsim.git] / plugins / net.mograsim.plugin.core / src / net / mograsim / plugin / tables / mi / InstructionTable.java

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 d598c3f..936ba5c 100644 (file)
--- 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" };