From 818f786b1dd9f25095661fab611f7e0ba647cfd0 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 24 Feb 2021 08:46:19 +0000 Subject: [PATCH] add dispose check in case view is closed while loading db --- .../scviewer/e4/application/parts/DesignBrowser.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java index 4b47c91..22314cd 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java @@ -133,10 +133,11 @@ public class DesignBrowser { treeViewer.refresh(); }); } else if(IHierNode.LOADING_FINISHED.equals(evt.getPropertyName())) { - treeViewer.getTree().getDisplay().asyncExec(() -> { - treeViewer.update(waveformViewerPart.getDatabase(), null); - DesignBrowser.this.updateButtons(); - }); + if(!treeViewer.getControl().isDisposed()) + treeViewer.getTree().getDisplay().asyncExec(() -> { + treeViewer.update(waveformViewerPart.getDatabase(), null); + DesignBrowser.this.updateButtons(); + }); } }; @@ -596,6 +597,7 @@ public class DesignBrowser { * Apply. */ public void apply() { + if(treeViewer.getControl().isDisposed()) return; treeViewer.setExpandedElements(expandedElements); treeViewer.setSelection(treeSelection, true); txTableViewer.setSelection(tableSelection, true);