X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tmf%2Forg.eclipse.tracecompass.tmf.ui%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fui%2Fviewers%2Ftable%2FTmfSimpleTableViewer.java;h=f204774deb006837ccc29fe108779bbd98f4333e;hb=25033fefb1d755a3fdedf3eeafaa4fbc951fba69;hp=d86404e8df563fdd304758fa051270244dd02ba5;hpb=30e9ac41772240e60fdd7576bf31e7e49b9d69fd;p=deliverable%2Ftracecompass.git

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
index d86404e8df..f204774deb 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Ericsson
+ * Copyright (c) 2015, 2016 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -192,6 +192,10 @@ public class TmfSimpleTableViewer extends TmfViewer {
 
         Menu tablePopup = fTablePopupMenuManager.createContextMenu(getTableViewer().getTable());
         getTableViewer().getTable().setMenu(tablePopup);
+
+        tableControl.addDisposeListener((e) -> {
+            internalDispose();
+        });
     }
 
     @Override
@@ -199,6 +203,9 @@ public class TmfSimpleTableViewer extends TmfViewer {
         if (fTableViewer != null) {
             fTableViewer.getControl().dispose();
         }
+    }
+
+    private void internalDispose() {
         if (fTablePopupMenuManager != null) {
             fTablePopupMenuManager.dispose();
         }