Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable merge: disconnect thgrepo signals at close

Changeset b5e680aa4d23…

Parent 372effa4384b…

by Steve Borho

Changes to one file · Browse files at b5e680aa4d23 Showing diff from parent 372effa4384b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
68
69
70
 
 
 
 
 
71
72
73
 
68
69
70
71
72
73
74
75
76
77
78
@@ -68,6 +68,11 @@
  page.reject()   super(MergeDialog, self).reject()   + def done(self, ret): + self.repo.repositoryChanged.disconnect(self.repositoryChanged) + self.repo.configChanged.disconnect(self.configChanged) + super(MergeDialog, self).done(ret) +  MAIN_PANE = 0  PERFORM_PANE = 1