diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index 1283c1ec82..877689badf 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -1210,7 +1210,7 @@ public class MultiTemplateTabPane extends JComponent { private boolean checkCurrentClose(JTemplate template) { JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - return currentTemplate != null && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath()); + return JTemplate.isValid(currentTemplate) && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath()); } private class MultiTemplateTabMouseMotionListener implements MouseMotionListener {