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=648fc6e69e09fe4467cb6bac47934be1a7dcf0d6;hp=801082d05f8c4f25c983465423f5ff6bc7609cc5;hpb=925846da463235961d749c2bd4615e0cb83f4f24;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 801082d0..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
@@ -5,8 +5,6 @@ import java.io.InputStream;
 import java.util.Optional;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.ui.DebugUITools;
@@ -30,7 +28,6 @@ import net.mograsim.machine.mi.MicroInstructionMemoryParseException;
 import net.mograsim.machine.mi.MicroInstructionMemoryParser;
 import net.mograsim.plugin.launch.MachineDebugContextListener;
 import net.mograsim.plugin.launch.MachineDebugTarget;
-import net.mograsim.plugin.launch.MachineLaunchConfigType.MachineLaunchParams;
 import net.mograsim.plugin.nature.MachineContext;
 import net.mograsim.plugin.nature.ProjectMachineContext;
 import net.mograsim.plugin.tables.DisplaySettings;
@@ -68,10 +65,7 @@ public class InstructionView extends EditorPart
 
 			newTarget.ifPresent(target ->
 			{
-				MachineLaunchParams params = target.getLaunchParams();
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(params.getProjectPath());
-
-				if (file.equals(project.getFile(params.getMpmPath())))
+				if (file.equals(target.getMPMFile()))
 				{
 					Machine m = target.getMachine();
 					target.getMachine().addActiveMicroInstructionChangedListener(instChangeListener);
@@ -238,7 +232,8 @@ public class InstructionView extends EditorPart
 	@Override
 	public void dispose()
 	{
-		memory.deregisterCellModifiedListener(cellModifiedListener);
+		if (memory != null)
+			memory.deregisterCellModifiedListener(cellModifiedListener);
 		super.dispose();
 	}