diff -r 056d98a54dd4 -r c28d0cf3b639 Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Feb 22 12:16:32 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Feb 22 19:21:55 2015 +0100
@@ -15,7 +15,7 @@
import os
-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication
+from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QCoreApplication
from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, \
QListWidgetItem
@@ -42,7 +42,6 @@
super(HgQueuesDefineGuardsDialog, self).__init__(parent)
self.setupUi(self)
- self.process = None
self.vcs = vcs
self.extension = extension
self.__hgClient = vcs.getClient()
@@ -68,12 +67,6 @@
if self.__hgClient:
if self.__hgClient.isExecuting():
self.__hgClient.cancel()
- else:
- if self.process is not None and \
- self.process.state() != QProcess.NotRunning:
- self.process.terminate()
- QTimer.singleShot(2000, self.process.kill)
- self.process.waitForFinished(3000)
if self.__dirtyList:
res = E5MessageBox.question(
