Mercurial Repositories > eric / file diff

diff -r e1d8a8a4d40c -r 885706dbb69f Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Wed Aug 31 18:44:04 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Wed Aug 31 19:28:49 2011 +0200
@@ -66,7 +66,8 @@
         @param e close event (QCloseEvent)
         """
         if self.__hgClient:
-            self.__hgClient.cancel()
+            if self.__hgClient.isExecuting():
+                self.__hgClient.cancel()
         else:
             if self.process is not None and \
                self.process.state() != QProcess.NotRunning:
@@ -155,6 +156,8 @@
             if out:
                 for line in out.splitlines(True):
                     self.__processOutputLine(line)
+                    if self.__hgClient.wasCanceled():
+                        break
             
             if err:
                 self.__showError(err)