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 e7a15b5fdd2e8e338be352ea0d48e6a72831ab27..d3ab7328723bf683dc6ac1c84769b9709f56f977 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 @@ -1406,7 +1406,7 @@ public class ResultSetViewer extends Viewer */ private void updateToolbar() { - statusBar.setRedraw(false); + if (statusBar != null) statusBar.setRedraw(false); try { for (ToolBarManager tb : toolbarList) { UIUtils.updateContributionItems(tb); @@ -1414,9 +1414,9 @@ public class ResultSetViewer extends Viewer if (panelToolBar != null) { UIUtils.updateContributionItems(panelToolBar); } - statusBar.layout(true, true); + if (statusBar != null) statusBar.layout(true, true); } finally { - statusBar.setRedraw(true); + if (statusBar != null) statusBar.setRedraw(true); } } @@ -3363,6 +3363,9 @@ public class ResultSetViewer extends Viewer } public void setSelectionStatistics(String stats) { + if (selectionStatLabel == null) { + return; + } if (stats.equals(selectionStatLabel.getText())) { return; }