Make dataset with getName, not displayid

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

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