[QGIS Commit] r13839 - branches/threading-branch/src/core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-06-29 09:41:56 +0000 (Tue, 29 Jun 2010)
New Revision: 13839

Modified:
   branches/threading-branch/src/core/qgsmaprenderer.cpp
Log:
Do not cache the output if rendering has been stopped


Modified: branches/threading-branch/src/core/qgsmaprenderer.cpp
===================================================================
--- branches/threading-branch/src/core/qgsmaprenderer.cpp	2010-06-29 00:32:33 UTC (rev 13838)
+++ branches/threading-branch/src/core/qgsmaprenderer.cpp	2010-06-29 09:41:56 UTC (rev 13839)
@@ -567,7 +567,7 @@
     // TODO: error handling
     tctx.mr->renderLayer( tctx.ml, tctx.ctx );
 
-    if (tctx.mr->mCache)
+    if (tctx.mr->mCache && !tctx.ctx.renderingStopped())
     {
       // save cache image
       tctx.mr->mCache->setCacheImage( layerId, *tctx.img );
@@ -1418,7 +1418,6 @@
     // make sure that the layer won't be used in further rendering
     if (isDrawing())
       cancelThreadedRendering();
-    mLayerSet.removeAll(layerId);
   }
 }