Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py
- changeset 1256
- 885706dbb69f
- parent 1254
- c077fa008aae
- child 1260
- 9488a3aceb0e
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 48 """ | 48 """ |
| 49 Private slot implementing a close event handler. | 49 Private slot implementing a close event handler. |
| 50 | 50 |
| 51 @param e close event (QCloseEvent) | 51 @param e close event (QCloseEvent) |
| 52 """ | 52 """ |
| 53 if self.process is not None and \ | 53 if self.__hgClient: |
| 54 self.process.state() != QProcess.NotRunning: | 54 if self.__hgClient.isExecuting(): |
| 55 self.process.terminate() | 55 self.__hgClient.cancel() |
| 56 QTimer.singleShot(2000, self.process.kill) | 56 else: |
| 57 self.process.waitForFinished(3000) | 57 if self.process is not None and \ |
| 58 self.process.state() != QProcess.NotRunning: | |
| 59 self.process.terminate() | |
| 60 QTimer.singleShot(2000, self.process.kill) | |
| 61 self.process.waitForFinished(3000) | |
| 58 | 62 |
| 59 e.accept() | 63 e.accept() |
| 60 | 64 |
| 61 def start(self, path): | 65 def start(self, path): |
| 62 """ | 66 """ |
