Merge pull request #2101 from mhugo/fix_cache_enabling

wonder-sk · wonder-sk · commit 1d073da72ae3 · 2015-06-19T16:08:05.000+08:00
Wait for the current rendering to finish before touching the cache
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;
