X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;h=be042e6b6476a7491dc7494d89a138d6771662d9;hb=134291d04042b3d7252598a9f73753f40da08a18;hp=fb96b2218eb06e0db036eae5bbe9798009128f41;hpb=6b8f46dd2ffc7f73948f0523c9b45336d2bd8128;p=jalview.git

diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java
index fb96b22..be042e6 100644
--- a/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@ -385,7 +385,11 @@ public class StructureSelectionManager
     try
     {
 
-      if (pdbFile != null && isCIFFile(pdbFile))
+      boolean isParseWithJMOL = StructureImportSettings
+              .getDefaultPDBFileParser().equalsIgnoreCase(
+                      StructureImportSettings.StructureParser.JMOL_PARSER
+                              .toString());
+      if (isParseWithJMOL || (pdbFile != null && isCIFFile(pdbFile)))
       {
         pdb = new jalview.ext.jmol.JmolParser(addTempFacAnnot, parseSecStr,
                 secStructServices, pdbFile, protocol);