From 677d12a1f28b1ae263f780aaf0adc9b6c347c56a Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Fri, 27 May 2022 14:48:09 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-70481=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=87=E6=8D=A2=E6=A0=A1=E9=AA=8C=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9-=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=85=88=E8=B7=B3=E5=87=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=86=8D=E8=B7=B3?=
 =?UTF-8?q?=E5=87=BA=E9=87=8D=E5=90=AF=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/actions/file/PreferencePane.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index 5c403e8cfd..100bd59657 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -890,6 +890,9 @@ public class PreferencePane extends BasicPane {
         if (!languageChanged) {
             return;
         }
+        // 重启弹窗出现之前提示用户保存模板
+        SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(this));
+        saveSomeTempaltePane.showSavePane();
         int rv = JOptionPane.showOptionDialog(
                 null,
                 i18nText("Fine-Design_Basic_Language_Change_Successful"),
@@ -901,11 +904,7 @@ public class PreferencePane extends BasicPane {
                 null
         );
         if (rv == JOptionPane.OK_OPTION) {
-            // 重启前需要保存下模板
-            SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(this));
-            if (saveSomeTempaltePane.showSavePane()) {
-                RestartHelper.restart();
-            }
+            RestartHelper.restart();
         }
     }