From c9b196c5c118ff5de16f7191d7e2ef85d66dc29c Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Sat, 30 Sep 2017 16:56:34 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4957=20[9.0=E5=86=85=E6=B5=8B]=20?=
 =?UTF-8?q?=E5=8F=B3=E8=BE=B9=E5=86=85=E5=AE=B9=E5=B1=9E=E6=80=A7=E8=A1=A8?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8F=98=E7=B2=89=E7=BA=A2=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 0ae101996..cd5a03f65 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -589,7 +589,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             if (popupDialog != null && isPoppedOut) {
                 popupDialog.replaceContentPane(this);
             }
-            if (popupPane != null && !isRightPaneVisible()) {
+            if (popupPane != null && popupPane.isVisible()) {
                 popupPane.replaceContentPane(contentArea);
             }
 
@@ -627,7 +627,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             if (isRightPaneVisible()) {
                 hideCurrentPopupPane();
                 replaceContentPane(contentPane);
-            } else if(popupPane != null) {
+            } else if(popupPane != null && popupPane.isVisible()) {
                 popupPane.replaceContentPane(contentArea);
             }
         }