X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=99b86202304a172d20cba3fa35195ea245bec4e9;hb=2e699d341f8e64868e3c279f9c02af617c4e9b44;hp=8b53b46174cf925ecf404bae28b9982921559cfe;hpb=559b96a91b710f3f2e116790c9cf7e3aa6c76766;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 8b53b46..99b8620 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -118,6 +118,10 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
               public void actionPerformed(ActionEvent e)
               {
                 av.hideColumns(res, res);
+                if(av.getSelectionGroup()!=null
+                   && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())
+                  av.setSelectionGroup(null);
+
                 ap.repaint();
                 if (ap.overviewPanel != null)
                   ap.overviewPanel.updateOverviewImage();
@@ -192,15 +196,16 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 
         SequenceGroup sg = av.getSelectionGroup();
 
-        if (res > sg.getStartRes())
-        {
+        if(sg!=null){
+          if (res > sg.getStartRes())
+          {
             sg.setEndRes(res);
-        }
-        else if (res < sg.getStartRes())
-        {
+          }
+          else if (res < sg.getStartRes())
+          {
             sg.setStartRes(res);
+          }
         }
-
         stretchingGroup = false;
         ap.repaint();
     }