From ef5e7fe3e61ac5e568486913e79f1f95a0425011 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 16 Aug 2017 15:56:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=AD=90=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=82=AC=E6=B5=AE=E5=BC=B9=E7=AA=97=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/gui/controlpane/UIControlPane.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
index 5908f06e1a..74c64de329 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
@@ -301,6 +301,12 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
                     return;
                 }
             }
+            // 如果有可见模态对话框，则不隐藏
+            for (Window window : DesignerContext.getDesignerFrame().getOwnedWindows()) {
+                if (window instanceof JDialog && window.isVisible() && ((JDialog)window).isModal()) {
+                    return;
+                }
+            }
             saveSettings();
             setVisible(false);
         }