AAFrequency optimized

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 79f1e8b..1bcd39e 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -115,7 +115,7 @@ public class AlignFrame
   {
     this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
 
-    if (viewport.vconsensus == null)
+    if (viewport.hconsensus == null)
     {
       //Out of memory calculating consensus.
       BLOSUM62Colour.setEnabled(false);
@@ -832,7 +832,7 @@ public class AlignFrame
    */
   void updateEditMenuBar()
   {
-    if (historyList.size() > 0)
+  /*  if (historyList.size() > 0)
     {
       undoMenuItem.setEnabled(true);
 
@@ -856,7 +856,7 @@ public class AlignFrame
     {
       redoMenuItem.setEnabled(false);
       redoMenuItem.setText("Redo");
-    }
+    }*/
   }
 
   /**
@@ -1614,7 +1614,7 @@ public class AlignFrame
    if (av.padGaps)
        av.getAlignment().padGaps();
 
-     if (av.vconsensus != null && av.autoCalculateConsensus)
+     if (av.hconsensus != null && av.autoCalculateConsensus)
      {
        av.updateConsensus();
        av.updateConservation();
@@ -1643,7 +1643,7 @@ public class AlignFrame
                           viewport.alignment.getWidth());
       }
 
-      cs.setConsensus(viewport.vconsensus);
+      cs.setConsensus(viewport.hconsensus);
       if (cs.conservationApplied())
       {
         Alignment al = (Alignment) viewport.alignment;
@@ -2089,7 +2089,7 @@ public class AlignFrame
         cs.setConservation(null);
       }
 
-      cs.setConsensus(viewport.vconsensus);
+      cs.setConsensus(viewport.hconsensus);
     }
 
     viewport.setGlobalColourScheme(cs);