Tools/SCViewer
Tools
/
SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

release/2.1.2 #24

Manually merged
eyck merged 11 commits from release/2.1.2 into master 2020-02-10 06:50:59 +01:00
Conversation 0 Commits 11 Files Changed 18 +8 -3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7c1f97b0c - Show all commits

11
com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
View File

@ -60,6 +60,7 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.ToolItem;
@ -373,9 +374,13 @@ public class DesignBrowser {
waveformViewerPart.addDisposeListener( new DisposeListener() { waveformViewerPart.addDisposeListener( new DisposeListener() {
@Override @Override
public void widgetDisposed(DisposeEvent e) { public void widgetDisposed(DisposeEvent e) {
// reset tree- and tableviewer Control control = treeViewer.getControl();
resetTreeViewer(); // check if widget is already disposed (f.ex. because of workbench closing)
} if (control == null || control.isDisposed()) { //if so: do nothing
}else { //reset tree- and tableviewer
resetTreeViewer();
}
}
} ); } );
} }
this.waveformViewerPart=waveformViewerPart; this.waveformViewerPart=waveformViewerPart;