From 7bbbab214f812d662d7eccc772e48b1fee40c46f Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 17 Feb 2019 22:06:38 +0300
Subject: [PATCH] #5300 Calc panel menu handlers fix

---
 .../resultset/panel/aggregate/AggregateColumnsPanel.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java
index 2e80604081..3999dba08a 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java
@@ -341,14 +341,10 @@ public class AggregateColumnsPanel implements IResultSetPanel {
                 }
 
                 final Menu contextMenu = menuManager.createContextMenu(aggregateTable);
-                contextMenu.addMenuListener(new MenuAdapter() {
-                    @Override
-                    public void menuHidden(MenuEvent e) {
-                        menuManager.dispose();
-                    }
-                });
                 contextMenu.setLocation(location);
                 contextMenu.setVisible(true);
+
+                aggregateTable.addDisposeListener(e -> menuManager.dispose());
             }
         }
     }
-- 
GitLab