X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=7cb376324adee2c5752346c4fbbd63b0277adcbf;hb=a28c9340eeadfdaa551a21b9dea1d0f1530126e3;hp=e152506f5e55f15c4e21188320822b7b15421a28;hpb=4ebc6d5b362bc093c39312aa1a69836e3dd6ae84;p=jalview.git

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index e152506..7cb3763 100755
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -144,18 +144,18 @@ public class Finder
       int res = Integer.parseInt(searchString);
       found = true;
 
-      if (av.getSelectionGroup().getSize() > 0)
+      if (av.getSelectionGroup() == null || av.getSelectionGroup().getSize() < 1)
       {
-        seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));
+        seq = (Sequence) av.getAlignment().getSequenceAt(0);
       }
       else
       {
-        seq = (Sequence) av.getAlignment().getSequenceAt(0);
+        seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));
       }
 
       searchResults.addElement(Integer.toString(av.getAlignment().findIndex(seq)));
-      searchResults.addElement(Integer.toString(seq.findIndex(res) - 1));
-      searchResults.addElement(Integer.toString(seq.findIndex(res) - 1));
+      searchResults.addElement(String.valueOf(res));
+      searchResults.addElement(String.valueOf(res));
 
     }
     catch (NumberFormatException ex)
@@ -246,6 +246,8 @@ public class Finder
 
           r = resIndex;
         }
+        else
+          break;
       }
       if (!found)
       {