Commits

Yuya Nishihara committed 0b06d3b

fileview: fix possible TypeError on AnnotateThread.abort (fixes #2188)

self._threadid can be changed to None after "if self._threadid is None".

Comments (0)

Files changed (1)

tortoisehg/hgqt/fileview.py

 
     @pyqtSlot()
     def abort(self):
-        if self._threadid is None:
+        threadid = self._threadid
+        if threadid is None:
             return
         try:
-            thread2._async_raise(self._threadid, KeyboardInterrupt)
+            thread2._async_raise(threadid, KeyboardInterrupt)
             self.wait()
         except ValueError:
             pass
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.