Merge branch 'develop' into Jalview-JS/develop

[jalview.git] / src / jalview / gui / IdPanel.java

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 46e5f14..5908810 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -273,6 +273,7 @@ public class IdPanel extends JPanel
     if (scrollThread != null)
     {
       scrollThread.stopScrolling();
+      scrollThread = null;
     }
   }
 
@@ -348,7 +349,7 @@ public class IdPanel extends JPanel
         {
           if (scrollThread == null)
           {
-            // finished and nulled itself
+            // IdPanel.stopScrolling called
             t.stop();
           }
         }
@@ -549,7 +550,7 @@ public class IdPanel extends JPanel
   {
     if (scrollThread != null)
     {
-      scrollThread.stopScrolling();
+      stopScrolling();
     }
     MousePos pos = alignPanel.getSeqPanel().findMousePosition(e);
 
@@ -618,7 +619,6 @@ public class IdPanel extends JPanel
     {
       this.up = up;
       setName("IdPanel$ScrollThread$" + String.valueOf(up));
-      start();
     }
 
     /**