From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 2 Feb 2007 17:17:10 +0000 (+0000)
Subject: catch control down before editing null pointer
X-Git-Tag: Release_2_3~385
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=82483c09d45298e6f93a7d3d2b537598cc0451b5;p=jalview.git

catch control down before editing null pointer
---

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 8b9b5cb..6c1a619 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -791,6 +791,13 @@ public class SeqPanel
         //but the sequence represents a group
         if (sg == null)
         {
+          if (av.hiddenRepSequences == null
+              || !av.hiddenRepSequences.containsKey(seq))
+          {
+            endEditing();
+            return;
+          }
+
           sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
         }
 
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 57a30bf..08bf7df 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -874,6 +874,12 @@ public class SeqPanel extends JPanel implements MouseListener,
           //but the sequence represents a group
           if (sg == null)
           {
+            if(av.hiddenRepSequences==null
+               || !av.hiddenRepSequences.containsKey(seq))
+            {
+              endEditing();
+              return;
+            }
             sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
           }