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