From: jprocter <Jim Procter>
Date: Tue, 29 Jun 2010 16:24:11 +0000 (+0000)
Subject: jmol 12 patch - ensure we replace the correct filename in the jmol script before... 
X-Git-Tag: Release_2_6~152
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cdec8957d4dfd65ec894e9a51bc01b079bf3f7af;p=jalview.git

jmol 12 patch - ensure we replace the correct filename in the jmol script before it gets executed
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index af8b2c0..1a6024e 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -2510,14 +2510,15 @@ public class Jalview2XML
                 // create a new Jmol window
                 String state = ids[p].getStructureState(s).getContent();
                 StringBuffer newFileLoc = null;
-                if (state.indexOf("load") > -1)
+                int cp=0;
+                if ((cp=state.indexOf("load ")) > -1)
                 {
-                  newFileLoc = new StringBuffer(state.substring(0, state
-                          .indexOf("\"", state.indexOf("load")) + 1));
+                  newFileLoc = new StringBuffer(state.substring(0, (cp=state
+                          .indexOf("\"", cp+1)+1)));
 
                   newFileLoc.append(jpdb.getFile());
                   newFileLoc.append(state.substring(state.indexOf("\"",
-                          state.indexOf("load \"") + 6)));
+                          cp+1)));
                 }
                 else
                 {