From 44dc61af0050ec3d62afe2f974899e114a26ac26 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Sat, 11 Apr 2020 12:16:50 +0300
Subject: [PATCH] #8327 RSV: statistics render fix

---
 .../dbeaver/ui/controls/resultset/ResultSetViewer.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 e7a15b5fdd..d3ab732872 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;
         }
-- 
GitLab