sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't set override cursor in processing.run

Browse Source 
Callers may not want this, so leave it up to them to set
an override caller if desired
This commit is contained in:
Nyall Dawson 2017-06-27 11:24:59 +10:00
parent 3286ebb470
commit 4e93f8d038
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/processing/core/Processing.py
View File

@ -166,18 +166,6 @@ class Processing(object):
Processing.tr('Warning: Not all input layers use the same CRS.\nThis can cause unexpected results.'), Processing.tr('Warning: Not all input layers use the same CRS.\nThis can cause unexpected results.'),
Processing.tr("Processing")) Processing.tr("Processing"))
# Don't set the wait cursor twice, because then when you
# restore it, it will still be a wait cursor.
overrideCursor = False
if iface is not None:
cursor = QApplication.overrideCursor()
if cursor is None or cursor == 0:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
overrideCursor = True
elif cursor.shape() != Qt.WaitCursor:
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
overrideCursor = True
ret, results = execute(alg, parameters, context, feedback) ret, results = execute(alg, parameters, context, feedback)
if ret: if ret:
if onFinish is not None: if onFinish is not None:
@ -186,8 +174,6 @@ class Processing(object):
QgsMessageLog.logMessage(Processing.tr("There were errors executing the algorithm."), QgsMessageLog.logMessage(Processing.tr("There were errors executing the algorithm."),
Processing.tr("Processing")) Processing.tr("Processing"))
if overrideCursor:
QApplication.restoreOverrideCursor()
if isinstance(feedback, MessageBarProgress): if isinstance(feedback, MessageBarProgress):
feedback.close() feedback.close()
return results return results