Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

hgcmd: make more robust against early exit

CTRL-Q key can be hit before window is even mapped.

Changeset 8c8ef25eb7c3…

Parent 72ff9cfe1b9f…

by Steve Borho

Changes to one file · Browse files at 8c8ef25eb7c3 Showing diff from parent 72ff9cfe1b9f Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​hgcmd.py Stacked
 
28
29
30
 
31
32
33
 
93
94
95
96
 
 
97
98
99
100
101
102
 
103
104
105
 
157
158
159
160
 
 
 
 
161
162
163
 
28
29
30
31
32
33
34
 
94
95
96
 
97
98
99
100
101
102
103
 
104
105
106
107
 
159
160
161
 
162
163
164
165
166
167
168
@@ -28,6 +28,7 @@
  set_tortoise_icon(self, 'hg.ico')   self.cmdline = cmdline   self.returncode = None + self.hgthread = None     # construct dialog   self.set_default_size(width, height) @@ -93,13 +94,14 @@
  self.response(gtk.RESPONSE_ACCEPT)     def _on_stop_clicked(self, button): - self.hgthread.terminate() + if self.hgthread: + self.hgthread.terminate()     def _delete(self, widget, event):   return True     def _response(self, widget, response_id): - if self.hgthread.isAlive(): + if self.hgthread and self.hgthread.isAlive():   widget.emit_stop_by_name('response')     def _on_window_map_event(self, event, param): @@ -157,7 +159,10 @@
  self.pbar.pulse()     def return_code(self): - return self.hgthread.return_code() + if self.hgthread: + return self.hgthread.return_code() + else: + return False    def run(cmdline=[], gui=True, **opts):   if not gui: