Check for visibleGroup==null
authoramwaterhouse <Andrew Waterhouse>
Wed, 8 Mar 2006 16:54:28 +0000 (16:54 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 8 Mar 2006 16:54:28 +0000 (16:54 +0000)
src/jalview/gui/FeatureSettings.java

index 3979ebe..7c95ed7 100755 (executable)
@@ -231,10 +231,10 @@ public class FeatureSettings extends JPanel
       type = en.nextElement().toString();\r
       Color col = fr.getColour(type);\r
 \r
-\r
       //This will ignore any features which are in groups not shown\r
-     if(fr.featureGroups==null\r
-           ||   ((Boolean)fr.featureGroups.get(allFeatures.get(type))).booleanValue())\r
+     Object visibleGroup =  fr.featureGroups.get(allFeatures.get(type));\r
+     if(visibleGroup == null\r
+           || ((Boolean)(visibleGroup)).booleanValue())\r
       {\r
         tmp[tmpIndex][0] = type;\r
         tmp[tmpIndex][1] = col;\r