Merge remote-tracking branch 'origin/release/10.0' into release/10.0

6 years ago · 2df2b0f49d
1 changed files with 3 additions and 1 deletions
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@ -559,7 +559,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {

                    DesignerEnvManager.getEnvManager().setCurEnvName(envName);
                    DesignUtils.refreshDesignerFrame();
-                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
+                    if(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate() != null) {
+                        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
+                    }
                    DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
                }
            });