Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

cmdui: do not assume the Dialog runner used an in-process thread

Changeset c1fa6779ce32…

Parent e401d778573a…

by Steve Borho

Changes to one file · Browse files at c1fa6779ce32 Showing diff from parent e401d778573a Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​cmdui.py Stacked
 
769
770
771
772
773
774
775
776
777
 
778
779
780
 
785
786
787
 
788
789
790
 
769
770
771
 
772
773
774
775
 
776
777
778
779
 
784
785
786
787
788
789
790
@@ -769,12 +769,11 @@
  QMessageBox.No)   if ret == QMessageBox.Yes:   self.core.cancel() -   # don't close dialog   return     # close dialog - if self.core.thread.ret == 0: + if self.returnCode == 0:   self.accept() # means command successfully finished   else:   super(Dialog, self).reject() @@ -785,6 +784,7 @@
    @pyqtSlot(int)   def commandFinished(self, ret): + self.returnCode = ret   self.cancelBtn.setHidden(True)   self.closeBtn.setShown(True)   self.closeBtn.setFocus()