X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2FLogicUICanvas.java;h=51778c1d50f24c5c931b650d83aa6d65ee9b062d;hb=ebdf5a12e795656aa71e4bba14fea840205d4c26;hp=8db8578ef4f4deb408b5382e793a3d377b0b6588;hpb=dfea76c599b2875bcdfe7e785cc3b168f8983967;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
index 8db8578e..51778c1d 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
@@ -2,6 +2,7 @@ package net.mograsim.logic.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -35,7 +36,7 @@ import net.mograsim.preferences.Preferences;
  */
 public class LogicUICanvas extends ZoomableCanvas
 {
-	private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL = true;
+	private static final boolean OPEN_DEBUG_SETHIGHLEVELSTATE_SHELL = false;
 
 	private final ViewModel model;
 
@@ -83,8 +84,14 @@ public class LogicUICanvas extends ZoomableCanvas
 		Combo componentSelector = new Combo(debugShell, SWT.DROP_DOWN | SWT.READ_ONLY);
 		componentSelector.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		List<GUIComponent> componentsByItemIndex = new ArrayList<>();
-		model.addComponentAddedListener(c -> recalculateComponentSelector(componentsByItemIndex, componentSelector, model));
-		model.addComponentRemovedListener(c -> recalculateComponentSelector(componentsByItemIndex, componentSelector, model));
+		Consumer<? super GUIComponent> compsChanged = c -> recalculateComponentSelector(componentsByItemIndex, componentSelector, model);
+		model.addComponentAddedListener(compsChanged);
+		model.addComponentRemovedListener(compsChanged);
+		debugShell.addListener(SWT.Dispose, e ->
+		{
+			model.removeComponentAddedListener(compsChanged);
+			model.removeComponentRemovedListener(compsChanged);
+		});
 		recalculateComponentSelector(componentsByItemIndex, componentSelector, model);
 		new Label(debugShell, SWT.NONE).setText("Target state ID: ");
 		Text stateIDText = new Text(debugShell, SWT.SINGLE | SWT.LEAD | SWT.BORDER);