[QGIS Commit] r15693 - trunk/qgis/src/analysis/vector

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-04-11 13:41:28 -0700 (Mon, 11 Apr 2011)
New Revision: 15693

Modified:
   trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp
Log:
Return error code in zonal statistics if operation canceled by user

Modified: trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp
===================================================================
--- trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp	2011-04-11 20:01:17 UTC (rev 15692)
+++ trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp	2011-04-11 20:41:28 UTC (rev 15693)
@@ -209,6 +209,12 @@
 
   GDALClose( inputDataset );
   mPolygonLayer->updateFieldMap();
+
+  if ( p && p->wasCanceled() )
+  {
+    return 9;
+  }
+
   return 0;
 }