X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=8ece83fccbf0951b685be50f759742bc61831205;hb=b0123c396580412f9c2218caedfc173696cd0fe5;hp=c0271acec3c0781a334467878a459adcc69b1412;hpb=d0b7395c10aec7c5da5a5662fc69783ec78fae8d;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index c0271ac..8ece83f 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -170,12 +170,16 @@ public class AlignFrame
       {
         public void keyPressed(KeyEvent evt)
         {
-          if (viewport.cursorMode
-              && evt.getKeyCode() >= KeyEvent.VK_0
-              && evt.getKeyCode() <= KeyEvent.VK_9)
-          {
+          if (viewport.cursorMode &&
+              ( (evt.getKeyCode() >= KeyEvent.VK_0 &&
+                 evt.getKeyCode() <= KeyEvent.VK_9)
+               ||
+               (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 &&
+                evt.getKeyCode() <= KeyEvent.VK_NUMPAD9)
+              )
+              && Character.isDigit(evt.getKeyChar()))
             alignPanel.seqPanel.numberPressed(evt.getKeyChar());
-          }
+
 
           switch (evt.getKeyCode())
           {
@@ -962,7 +966,7 @@ public class AlignFrame
             PaintRefresher.RemoveComponent(ap.seqPanel.seqCanvas);
             PaintRefresher.RemoveComponent(ap.idPanel.idCanvas);
             PaintRefresher.RemoveComponent(ap);
-            ap.av.alignment.destroyAlignment();
+            ap.av.alignment = null;
           }
         }
         else
@@ -973,7 +977,7 @@ public class AlignFrame
           PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);
           PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);
           PaintRefresher.RemoveComponent(alignPanel);
-          alignPanel.av.alignment.destroyAlignment();
+          viewport.alignment = null;
           alignPanel = null;
           viewport = null;