From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 13 Sep 2016 09:51:27 +0000 (+0100)
Subject: JAL-2195 bug fix to enable restoring jmol session save on Windows on OSX
X-Git-Tag: Release_2_10_0~46
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f53d22d39b5c18b7db1d8c7396b5ec19df6ef17b;p=jalview.git

JAL-2195 bug fix to enable restoring jmol session save on Windows on OSX
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index a9ff3b8..7093a9a 100644
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -4009,6 +4009,12 @@ public class Jalview2XML
         // filename
         // translation differently.
         StructureData filedat = oldFiles.get(new File(oldfilenam));
+          if (filedat == null)
+          {
+            String reformatedOldFilename = oldfilenam.replaceAll("/",
+                    "\\\\");
+            filedat = oldFiles.get(new File(reformatedOldFilename));
+        }
         newFileLoc.append(Platform.escapeString(filedat.getFilePath()));
         pdbfilenames.add(filedat.getFilePath());
         pdbids.add(filedat.getPdbId());