Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
- changeset 1256
- 885706dbb69f
- parent 1254
- c077fa008aae
- child 1260
- 9488a3aceb0e
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 54 """ | 54 """ |
| 55 Private slot implementing a close event handler. | 55 Private slot implementing a close event handler. |
| 56 | 56 |
| 57 @param e close event (QCloseEvent) | 57 @param e close event (QCloseEvent) |
| 58 """ | 58 """ |
| 59 if self.process is not None and \ | 59 if self.__hgClient: |
| 60 self.process.state() != QProcess.NotRunning: | 60 if self.__hgClient.isExecuting(): |
| 61 self.process.terminate() | 61 self.__hgClient.cancel() |
| 62 QTimer.singleShot(2000, self.process.kill) | 62 else: |
| 63 self.process.waitForFinished(3000) | 63 if self.process is not None and \ |
| 64 self.process.state() != QProcess.NotRunning: | |
| 65 self.process.terminate() | |
| 66 QTimer.singleShot(2000, self.process.kill) | |
| 67 self.process.waitForFinished(3000) | |
| 64 | 68 |
| 65 if self.__dirtyList: | 69 if self.__dirtyList: |
| 66 res = E5MessageBox.question(self, | 70 res = E5MessageBox.question(self, |
| 67 self.trUtf8("Unsaved Changes"), | 71 self.trUtf8("Unsaved Changes"), |
| 68 self.trUtf8("""The guards list has been changed.""" | 72 self.trUtf8("""The guards list has been changed.""" |
