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 destroy() commit dialog at exit

Calling dlg.destroy() exposes some deep bug somewhere that tends to take
down the entire Python process. Calling hide() is much safer and provides
the same benefit to the user. Python _should_ reclaim the memory once the
dialog is no longer referenced.

Changeset 65b9bfc227d5…

Parent 6341a0155b9e…

by Steve Borho

Changes to one file · Browse files at 65b9bfc227d5 Showing diff from parent 6341a0155b9e Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
144
145
146
147
148
149
 
 
 
150
151
 
 
152
153
154
 
144
145
146
 
 
 
147
148
149
150
 
151
152
153
154
155
@@ -144,11 +144,12 @@
  # refresh the log tool   if self.notify_func:   self.notify_func(self.notify_args) - # close merge dialog - gobject.idle_add(self.destroy) - # close commit tool + # hide merge dialog + self.hide() + # hide commit tool   dlg.ready = False # disables refresh - gobject.idle_add(dlg.destroy) + dlg.hide() + gobject.timeout_add(50, self.destroy)     def undo(self, button, local, merge, commit):   response = gdialog.Confirm(_('Confirm undo merge'), [], self,