property change race condition (bug 0062693) and isAligned assertion (bug 0008144)

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index c6d87d7..646cbb4 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -141,6 +141,8 @@ public class TreePanel extends GTreePanel
           if (tree == null)
           {
             System.out.println("tree is null");
+            // TODO: deal with case when a change event is received whilst a tree is still being calculated - should save reference for processing message later.
+            return;
           }
           if (evt.getNewValue() == null)
           {