From da3514e4db7e5cb9dd1e1200b4fb8dfaba8872c9 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Fri, 26 Apr 2019 13:58:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-14865=20=E6=9B=B4=E6=96=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8E=A8=E9=80=81=3D>=E6=98=BE=E7=A4=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../update/push/DesignerPushUpdateDialog.java    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
index 3327dd9ed..ab093605e 100644
--- a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
@@ -16,6 +16,7 @@ import com.fr.web.struct.category.StylePath;
 import com.fr.web.struct.impl.FineUI;
 
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Frame;
@@ -34,10 +35,15 @@ class DesignerPushUpdateDialog extends UIDialog {
         initComponents();
     }
 
-    static void createAndShow(Frame parent, DesignerUpdateInfo updateInfo) {
-        DesignerPushUpdateDialog dialog = new DesignerPushUpdateDialog(parent);
-        dialog.populate(updateInfo);
-        dialog.showDialog();
+    static void createAndShow(final Frame parent, final DesignerUpdateInfo updateInfo) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                DesignerPushUpdateDialog dialog = new DesignerPushUpdateDialog(parent);
+                dialog.populate(updateInfo);
+                dialog.showDialog();
+            }
+        });
+
     }
 
     private void initComponents() {
@@ -72,7 +78,7 @@ class DesignerPushUpdateDialog extends UIDialog {
 
     private Model createModel(DesignerUpdateInfo updateInfo) {
         Model model = new Model();
-        model.setVersion(updateInfo.getPushVersion());
+        model.setVersion(updateInfo.getLatestVersion());
         model.setContent(updateInfo.getPushContent());
         model.setMoreInfoUrl(updateInfo.getMoreInfoUrl());
         model.setBackgroundUrl(updateInfo.getBackgroundUrl());