From bee302560185dbef05914b0704506ef454ff3cc6 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 22 Nov 2017 15:04:49 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5661=20mac=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=9C=80=E8=BF=91=E7=9A=84=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=A8=A1=E6=9D=BF=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 +-
 designer_base/src/com/fr/design/mainframe/JTemplate.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
index f6c2b2c404..b8dc09bab7 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
@@ -918,7 +918,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (tplFile instanceof FileFILE) {
             fullName = tplFile.getPath();
         }
-        fullName = OperatingSystem.isMacOS() ? fullName.replaceAll("\\\\", "/") : fullName.replaceAll("/", "\\\\");
+        fullName = OperatingSystem.isWindows() ? fullName.replaceAll("/", "\\\\") : fullName.replaceAll("\\\\", "/");
         int index = HistoryTemplateListPane.getInstance().contains(fullName);
         if (index != -1) {
             this.activateJTemplate(HistoryTemplateListPane.getInstance().getHistoryList().get(index));
diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 5705f784d5..e7be23efd3 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -197,7 +197,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         if (editingFileName.startsWith(ProjectConstants.REPORTLETS_NAME)) {
             editingFileName = ((FileNodeFILE) getEditingFILE()).getEnvPath() + File.separator + editingFileName;
         }
-        if (!OperatingSystem.isMacOS()) {
+        if (OperatingSystem.isWindows()) {
             return editingFileName.replaceAll("/", "\\\\");
         } else {
             return editingFileName.replaceAll("\\\\", "/");