If no consensus, disable certain colour options

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index ba9237b..46b2cc5 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -68,6 +68,17 @@ public class AlignFrame
   {\r
     viewport = new AlignViewport(al);\r
 \r
+    if(viewport.vconsensus==null)\r
+    {\r
+      //Out of memory caluclating consensus.\r
+      BLOSUM62Colour.setEnabled(false);\r
+      PIDColour.setEnabled(false);\r
+      conservationMenuItem.setEnabled(false);\r
+      modifyConservation.setEnabled(false);\r
+      abovePIDThreshold.setEnabled(false);\r
+      modifyPID.setEnabled(false);\r
+    }\r
+\r
     alignPanel = new AlignmentPanel(this, viewport);\r
     alignPanel.annotationPanel.adjustPanelHeight();\r
     alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.\r
@@ -96,6 +107,7 @@ public class AlignFrame
      }\r
    });\r
 \r
+\r
     addServiceListeners();\r
   }\r
 \r
@@ -1022,14 +1034,16 @@ public class AlignFrame
 \r
     viewport.setStartRes(seq.findIndex(startRes)-1);\r
 \r
-\r
     viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
   }\r
 \r
  public void alignmentChanged()\r
  {\r
-   viewport.updateConsensus();\r
-   viewport.updateConservation();\r
+   if(viewport.vconsensus!=null)\r
+   {\r
+     viewport.updateConsensus();\r
+     viewport.updateConservation();\r
+   }\r
    resetAllColourSchemes();\r
    alignPanel.repaint();\r
  }\r