* Don't completely block algorithm thread while stopping it

1 files changed, 5 insertions, 3 deletions

diff --git a/tsp.py b/tsp.py
index 1b55713..1374b67 100755
--- a/tsp.py
+++ b/tsp.py
@@ -27,6 +27,7 @@
 import pygtk
 pygtk.require ("2.0")
 import gtk
+import gobject
 
 gtk.gdk.threads_init ()
 
@@ -305,8 +306,6 @@ class AlgoThread (threading.Thread):
         runner = self.algo.run (best)
         while not self.terminate:
             path = runner.next ()
-            if self.terminate:
-                return
             if not best or path.length < best.length:
                 best = path
                 self.update_best (path = best)
@@ -454,7 +453,10 @@ class AlgoGui (gtk.Window):
     def stop (self, *args):
         if self.thread:
             self.thread.stop ()
-            self.thread.join ()
+            self.thread.join (0.1)
+            if self.thread.isAlive ():
+                gobject.timeout_add (100, self.stop)
+                return
             self.thread = None
         self.gen_button.set_sensitive (True)
         self.start_button.set_sensitive (True)