Fix stats dock handling when refresh is clicked lots of times quickly

qgis · May 1, 2018 · 2233bd4 · 2233bd4
1 parent 8961ac4
commit 2233bd4
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp
@@ -219,10 +219,16 @@ void QgsStatisticalSummaryDockWidget::refreshStatistics()
 
 void QgsStatisticalSummaryDockWidget::gathererFinished()
 {
-  mGatherer = nullptr;
-  mCalculatingProgressBar->setValue( -1 );
-  mCancelButton->hide();
-  mCalculatingProgressBar->hide();
+  QgsStatisticsValueGatherer *gatherer = qobject_cast<QgsStatisticsValueGatherer *>( QObject::sender() );
+  // this may have been sent from a gathererer which was canceled previously and we don't care
+  // about it anymore...
+  if ( gatherer == mGatherer )
+  {
+    mGatherer = nullptr;
+    mCalculatingProgressBar->setValue( -1 );
+    mCancelButton->hide();
+    mCalculatingProgressBar->hide();
+  }
 }
 
 void QgsStatisticalSummaryDockWidget::updateNumericStatistics()