From 952f23723a433782ca8852e56f76b118d5055e90 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Mon, 18 Feb 2019 14:22:28 +0300 Subject: [PATCH] RSV: context menu dispose fix --- .../dbeaver/ui/controls/resultset/ResultSetViewer.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/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index ed172868ad..3588868329 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -1827,6 +1827,7 @@ public class ResultSetViewer extends Viewer MenuManager menuManager = new MenuManager(); fillFiltersMenu(curAttribute, menuManager); showContextMenuAtCursor(menuManager); + viewerPanel.addDisposeListener(e -> menuManager.dispose()); } @Override @@ -1871,6 +1872,7 @@ public class ResultSetViewer extends Viewer MenuManager menuManager = createRefTablesMenu(currentRow, openInNewWindow); if (menuManager != null) { showContextMenuAtCursor(menuManager); + viewerPanel.addDisposeListener(e -> menuManager.dispose()); } } @@ -1880,12 +1882,6 @@ public class ResultSetViewer extends Viewer final Menu contextMenu = menuManager.createContextMenu(getActivePresentation().getControl()); contextMenu.setLocation(location); contextMenu.setVisible(true); - contextMenu.addMenuListener(new MenuAdapter() { - @Override - public void menuHidden(MenuEvent e) { - menuManager.dispose(); - } - }); } } -- GitLab