X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=2bac0deade798553b8007af8d9915b1032070a0f;hb=a487459285df2b2e06047098ad8cb8e4920b41b8;hp=7fffb80929d360a81b40c5c0efa3c04c71b187b6;hpb=a3c9ea9db5a8d02b1db4640809a2b4c825ed3245;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 7fffb80..2bac0de 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -94,6 +94,11 @@ public class JalviewFileChooser
 
   public String getSelectedFormat()
   {
+    if(getFileFilter()==null)
+    {
+      return null;
+    }
+
     String format = getFileFilter().getDescription();
 
     if (format.toUpperCase().startsWith("JALVIEW"))
@@ -157,7 +162,7 @@ public class JalviewFileChooser
 
       if (confirm != JOptionPane.YES_OPTION)
       {
-        ret = this.CANCEL_OPTION;
+        ret = JalviewFileChooser.CANCEL_OPTION;
       }
     }