fix for JAL-1461 - check that filetype setting in browser is non-null
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 4 Apr 2014 15:16:58 +0000 (16:16 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 4 Apr 2014 15:16:58 +0000 (16:16 +0100)
src/jalview/gui/Desktop.java

index 6715537..fc6d6f9 100644 (file)
@@ -914,7 +914,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
               .getSelectedFile().getParent());
 
       String format = null;
-      if (chooser.getSelectedFormat().equals("Jalview"))
+      if (chooser.getSelectedFormat()!=null && chooser.getSelectedFormat().equals("Jalview"))
       {
         format = "Jalview";
       }