Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 1256
- 885706dbb69f
- parent 1250
- dafdd7d97a9f
- child 1263
- 1b6054a9b668
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 157 """ | 157 """ |
| 158 Private slot implementing a close event handler. | 158 Private slot implementing a close event handler. |
| 159 | 159 |
| 160 @param e close event (QCloseEvent) | 160 @param e close event (QCloseEvent) |
| 161 """ | 161 """ |
| 162 if self.process is not None and \ | 162 if self.__hgClient: |
| 163 self.process.state() != QProcess.NotRunning: | 163 if self.__hgClient.isExecuting(): |
| 164 self.process.terminate() | 164 self.__hgClient.cancel() |
| 165 QTimer.singleShot(2000, self.process.kill) | 165 else: |
| 166 self.process.waitForFinished(3000) | 166 if self.process is not None and \ |
| 167 self.process.state() != QProcess.NotRunning: | |
| 168 self.process.terminate() | |
| 169 QTimer.singleShot(2000, self.process.kill) | |
| 170 self.process.waitForFinished(3000) | |
| 167 | 171 |
| 168 e.accept() | 172 e.accept() |
| 169 | 173 |
| 170 def __resizeColumnsLog(self): | 174 def __resizeColumnsLog(self): |
| 171 """ | 175 """ |
