From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Tue, 20 Aug 2019 20:08:27 +0000 (+0200)
Subject: Fixed crash when components change after HighLevelStateShell is closed
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=73bddbe26c0058d040a59f38a3a22c0e299f939e;hp=0dff0f06c05ad9b778c29d05b300b399937097e9;p=Mograsim.git

Fixed crash when components change after HighLevelStateShell is closed
---

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 11e46345..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;
@@ -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);