Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge: do not allow commit tool to refresh during shutdown

This avoids shutdown race conditions in the commit tool

Changeset aa655423079f…

Parent 1ca0d86560af…

by Steve Borho

Changes to one file · Browse files at aa655423079f Showing diff from parent 1ca0d86560af Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
145
146
147
148
149
 
 
 
150
151
152
 
145
146
147
 
 
148
149
150
151
152
153
@@ -145,8 +145,9 @@
  if self.notify_func:   self.notify_func(self.notify_args)   # close merge dialog - self.destroy() - # close commit tool after allowing it to finish post-processing + gobject.idle_add(self.destroy) + # close commit tool + dlg.ready = False # disables refresh   gobject.idle_add(dlg.destroy)     def undo(self, button, local, merge, commit):