Cancelation terminates thread.

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@248 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Jun 16, 2012 · 1c4a756 · 1c4a756
1 parent a5c7b56
commit 1c4a756
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/sextante/core/Sextante.py b/src/sextante/core/Sextante.py
@@ -277,8 +277,7 @@ def runalg(name, *args):
         SextanteLog.addToLog(SextanteLog.LOG_ALGORITHM, alg.getAsCommand())
 
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
-        algEx = AlgorithmExecutor(alg)
-        algEx.start()
+        alg.execute()
         QApplication.restoreOverrideCursor()
         return alg.getOutputValuesAsDictionary()
 

diff --git a/src/sextante/gui/BatchProcessingDialog.py b/src/sextante/gui/BatchProcessingDialog.py
@@ -114,6 +114,8 @@ def loadHTMLResults(self, alg, i):
 
     def cancelPressed(self):
         self.algs = None
+        if self.algEx:
+            self.algEx.terminate()
         self.close()
 
     @pyqtSlot()

diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py
@@ -227,6 +227,7 @@ def error(self, msg):
     def cancel(self):
         try:
             self.algEx.finished.disconnect()
+            self.algEx.terminate()
             QApplication.restoreOverrideCursor()
             self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setEnabled(False)
         except: