X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=a733e24c1763300c9d01178fa804cf859b145c86;hb=7bc213bae5828287329a3490faba291706599b03;hp=b642fb3924f7f9396f105d28bbc192d779a7b2df;hpb=f441357783f32298b738d32d5c87000ac0e33768;p=jalview.git

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index b642fb3..a733e24 100755
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -374,7 +374,9 @@ public class FeatureSettings extends Panel implements ItemListener,
 
     selectedCheck = (MyCheckbox)evt.getSource();
 
-    if ( fr.featureLinks.containsKey(selectedCheck.getLabel() )   )
+    if(fr.featureLinks!=null
+       && fr.featureLinks.containsKey(selectedCheck.getLabel() )
+        )
       {
         if(evt.getX()>selectedCheck.stringWidth+20)
         {
@@ -451,7 +453,8 @@ public class FeatureSettings extends Panel implements ItemListener,
   {
     MyCheckbox check = (MyCheckbox) evt.getSource();
 
-    if (fr.featureLinks.containsKey(check.getLabel()))
+    if (fr.featureLinks!=null
+        && fr.featureLinks.containsKey(check.getLabel()))
     {
       if (evt.getX() > check.stringWidth + 20)
       {
@@ -487,6 +490,7 @@ public class FeatureSettings extends Panel implements ItemListener,
     public MyCheckbox(String label, boolean checked, boolean haslink)
     {
       super(label, checked);
+
       FontMetrics fm = av.nullFrame.getFontMetrics(av.nullFrame.getFont());
       stringWidth = fm.stringWidth(label);
       this.hasLink = haslink;