Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
eric6/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- changeset 7262
- c4b5f3393d63
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7261:3ead033becb8 | 7262:c4b5f3393d63 |
|---|---|
| 68 """ | 68 """ |
| 69 Protected slot implementing a close event handler. | 69 Protected slot implementing a close event handler. |
| 70 | 70 |
| 71 @param e close event (QCloseEvent) | 71 @param e close event (QCloseEvent) |
| 72 """ | 72 """ |
| 73 if self.process is not None and \ | 73 if ( |
| 74 self.process.state() != QProcess.NotRunning: | 74 self.process is not None and |
| 75 self.process.state() != QProcess.NotRunning | |
| 76 ): | |
| 75 self.process.terminate() | 77 self.process.terminate() |
| 76 QTimer.singleShot(2000, self.process.kill) | 78 QTimer.singleShot(2000, self.process.kill) |
| 77 self.process.waitForFinished(3000) | 79 self.process.waitForFinished(3000) |
| 78 | 80 |
| 79 e.accept() | 81 e.accept() |
