X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionView.java;h=b9627aada38a29b075927a0835a9c7e6932d6d3d;hb=4294019fb99a78ffa6802c0765e4efb7f96bd880;hp=68e83298932facecb7483849394d3d247fa13e2a;hpb=7b04f19d857431338d2ae17ffcc1b706f4cbce1a;p=Mograsim.git

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index 68e83298..b9627aad 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@ -69,6 +69,7 @@ public class InstructionView extends ViewPart implements ContextObserver
 
 		displaySettings.addObserver(() -> viewer.refresh());
 		MachineContext.getInstance().registerObserver(this);
+		setMachine(Optional.ofNullable(MachineContext.getInstance().getMachine()));
 	}
 
 	public void highlight(int index)
@@ -125,7 +126,8 @@ public class InstructionView extends ViewPart implements ContextObserver
 	private void deleteColumns()
 	{
 		for (TableViewerColumn col : columns)
-			col.getColumn().dispose();
+			if (col != null)
+				col.getColumn().dispose();
 	}
 
 	private void createColumns()
@@ -147,7 +149,6 @@ public class InstructionView extends ViewPart implements ContextObserver
 
 			createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
 		}
-
 	}
 
 	private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)