When closed, highlightSearchResults( null )

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index c5a2cf4..a819a18 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -61,8 +61,10 @@ public class Finder extends GFinder
   public void cancel_actionPerformed(ActionEvent e)\r
   {\r
     try{\r
+      // if allResults is null, this effectively switches displaySearch flag in seqCanvas\r
+      ap.highlightSearchResults( null );\r
       frame.setClosed(true);\r
-    }catch(Exception ex){}\r
+    }catch(Exception ex){ }\r
 \r
   }\r
 \r
@@ -112,8 +114,6 @@ public class Finder extends GFinder
       for(int i=0; i<searchResults.size(); i++)\r
         allResults[i] = Integer.parseInt(searchResults.get(i).toString());\r
 \r
-\r
-      ap.highlightSearchResults( allResults );\r
     }\r
     else\r
     {\r
@@ -123,6 +123,9 @@ public class Finder extends GFinder
       seqIndex=0;\r
     }\r
 \r
+    // if allResults is null, this effectively switches displaySearch flag in seqCanvas\r
+    ap.highlightSearchResults( allResults );\r
+\r
 \r
   }\r
 \r