Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable datamine: catch race conditions when terminating search threads

Closes #1005

Changeset 99e377f3a22b…

Parent 55e8532b6c7e…

by Steve Borho

Changes to one file · Browse files at 99e377f3a22b Showing diff from parent 55e8532b6c7e Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​datamine.py Stacked
 
541
542
543
544
545
 
 
 
 
 
 
546
547
548
 
541
542
543
 
 
544
545
546
547
548
549
550
551
552
@@ -541,8 +541,12 @@
    def stop_search(self, frame):   if getattr(frame, '_mythread', None): - frame._mythread.terminate() - frame._mythread.join() + if frame._mythread.isAlive(): + try: + frame._mythread.terminate() + frame._mythread.join() + except (threading.ThreadError, ValueError): + pass   frame._mythread = None     def close_page(self, button, widget):