Merge pull request #2101 from mhugo/fix_cache_enabling

Wait for the current rendering to finish before touching the cache
qgis · Jun 19, 2015 · 1d073da · 1d073da
2 parents 705eb74 + 72369fd
commit 1d073da
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -554,6 +554,12 @@ void QgsMapCanvas::setCachingEnabled( bool enabled )
   if ( enabled == isCachingEnabled() )
     return;
 
+  if ( mJob && mJob->isActive() )
+  {
+    // wait for the current rendering to finish, before touching the cache
+    mJob->waitForFinished();
+  }
+
   if ( enabled )
   {
     mCache = new QgsMapRendererCache;