Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py
- changeset 7257
- c4d0cac9b5c9
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7256:4ef3b78ebb4e | 7257:c4d0cac9b5c9 |
|---|---|
| 51 """ | 51 """ |
| 52 if self.__hgClient: | 52 if self.__hgClient: |
| 53 if self.__hgClient.isExecuting(): | 53 if self.__hgClient.isExecuting(): |
| 54 self.__hgClient.cancel() | 54 self.__hgClient.cancel() |
| 55 else: | 55 else: |
| 56 if self.process is not None and \ | 56 if ( |
| 57 self.process.state() != QProcess.NotRunning: | 57 self.process is not None and |
| 58 self.process.state() != QProcess.NotRunning | |
| 59 ): | |
| 58 self.process.terminate() | 60 self.process.terminate() |
| 59 QTimer.singleShot(2000, self.process.kill) | 61 QTimer.singleShot(2000, self.process.kill) |
| 60 self.process.waitForFinished(3000) | 62 self.process.waitForFinished(3000) |
| 61 | 63 |
| 62 e.accept() | 64 e.accept() |
