Merge branch 'develop' into trialMerge

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

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 88f9ae5..830efe2 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -298,7 +298,7 @@ public class FileLoader implements Runnable
       loadtime = -System.currentTimeMillis();
       AlignmentI al = null;
 
-      if (format == FileFormat.Jalview)
+      if (FileFormat.Jalview.equals(format))
       {
         if (source != null)
         {
@@ -317,7 +317,7 @@ public class FileLoader implements Runnable
             if (source != null)
             {
               // read from the provided source
-              al = new FormatAdapter().readFromFile(source, format);
+            al = new FormatAdapter().readFromFile(source, format);
             }
             else
             {