From aba5f269c9b7cd1bc8dff8def89f0670b8fbcc90 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Fri, 31 Jul 2020 15:11:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-30708=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A1=86=E4=B8=8D=E8=B7=9F=E9=9A=8F=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E9=85=8D=E7=BD=AE=E6=8C=89=E9=92=AE=20npe=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/EastRegionContainerPane.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
index 5d4a240ddb..a273828d84 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -1019,9 +1019,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
      * @date: 2020/7/30 11:39
      */
     public void freshCurrentPopupPane() {
-        if(currentPopupPane.isVisible()){
+        if (currentPopupPane != null && currentPopupPane.isVisible()) {
             hideCurrentPopupPane();
-            if (currentPopupPane != null && currentButton != null && !isRightPaneVisible()) {
+            if (currentButton != null && !isRightPaneVisible()) {
                 GUICoreUtils.showPopupMenu(currentPopupPane, currentButton, -currentPopupPane.getPreferredSize().width, 0);
             }
         }