Merge branch 'JAL-1447' into develop

[jalview.git] / src / jalview / io / IdentifyFile.java

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index 5307e95..9685b4e 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -191,16 +191,19 @@ public class IdentifyFile
             // Is this a single line BLC file?
             String data1 = source.nextLine();
             String data2 = source.nextLine();
+            int c1;
             if (checkPIR)
             {
               starterm = (data1 != null && data1.indexOf("*") > -1)
                       || (data2 != null && data2.indexOf("*") > -1);
             }
-            if (data2 != null && data.indexOf("*") > -1)
+            if (data2 != null && (c1=data.indexOf("*")) > -1)
             {
-              if (data.indexOf("*") == data2.indexOf("*"))
+              if (c1==0 && c1 == data2.indexOf("*"))
               {
                 reply = "BLC";
+              } else {
+                reply = "FASTA"; // possibly a bad choice - may be recognised as PIR 
               }
               // otherwise can still possibly be a PIR file
             }