X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionView.java;h=214bd8ce1bae257b89db149b047619db96c365a2;hb=733574abd1dd4e453e79aab9152a2f55533834a4;hp=1da1cbff491e4d91f90a2940ac100198b1b9030e;hpb=a0fae260c3294a22c172845de26b44b3efb24ee4;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index 1da1cbff..214bd8ce 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@ -232,7 +232,8 @@ public class InstructionView extends EditorPart
 	@Override
 	public void dispose()
 	{
-		memory.deregisterCellModifiedListener(cellModifiedListener);
+		if (memory != null)
+			memory.deregisterCellModifiedListener(cellModifiedListener);
 		super.dispose();
 	}