If alignment is closed, then undo performed in visible window

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 3a1ab05..ced0622 100755 (executable)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -842,7 +842,7 @@ public void itemStateChanged(ItemEvent evt)
           }\r
         }\r
       }\r
-      if (originalSource == null)\r
+      if (originalSource == null && al!=null)\r
       {\r
         //The original view is closed, we must validate\r
         //the current view against the closed view first\r
@@ -1372,13 +1372,11 @@ public void itemStateChanged(ItemEvent evt)
         viewSize++;\r
     }\r
 \r
-    StringBuffer title = new StringBuffer(this.getTitle());\r
+    String title = new String(this.getTitle());\r
     if (title.indexOf("(View") > -1)\r
-      title.setLength(title.indexOf("(View"));\r
+      title = title.substring(0, title.indexOf("(View"));\r
 \r
-    title.append("(View ");\r
-    title.append(viewSize);\r
-    title.append(")");\r
+    title+= "(View "+viewSize+")";\r
 \r
     newaf.setTitle(title.toString());\r
 \r

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 4afaf92..cc9ad28 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1016,6 +1016,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       AlignmentI al = editCommand.getAlignment();
       Vector comps = (Vector) PaintRefresher.components
           .get(viewport.getSequenceSetId());
+      System.out.println(comps.size());
       for (int i = 0; i < comps.size(); i++)
       {
         if (comps.elementAt(i) instanceof AlignmentPanel)
@@ -1027,7 +1028,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           }
         }
       }
-      if (originalSource == null)
+      if (originalSource == null && al!=null)
       {
         //The original view is closed, we must validate
         //the current view against the closed view first