Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / gui / PymolViewer.java

diff --git a/src/jalview/gui/PymolViewer.java b/src/jalview/gui/PymolViewer.java
index 665b137..52c253d 100644 (file)
--- a/src/jalview/gui/PymolViewer.java
+++ b/src/jalview/gui/PymolViewer.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import java.awt.event.ActionEvent;
@@ -250,9 +270,18 @@ public class PymolViewer extends StructureViewerBase
               stopProgressBar("", startTime);
             }
 
-            StructureFile pdb = binding.getSsm().setMapping(
-                    binding.getSequence()[pos], binding.getChains()[pos],
-                    pe.getFile(), protocol, getProgressIndicator());
+            StructureFile pdb = null;
+            if (pe.hasStructureFile())
+            {
+              pdb = pe.getStructureFile();
+              Console.debug("(Re)Using StructureFile " + pdb.getId());
+            }
+            else
+            {
+              pdb = binding.getSsm().setMapping(binding.getSequence()[pos],
+                      binding.getChains()[pos], pe.getFile(), protocol,
+                      getProgressIndicator());
+            }
             binding.stashFoundChains(pdb, pe.getFile());
           } catch (Exception ex)
           {