[QGIS Commit] r11198 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-07-29 06:51:24 -0400 (Wed, 29 Jul 2009)
New Revision: 11198

Modified:
   trunk/qgis/src/core/composer/qgscomposermap.cpp
Log:
Another fix to prevent concurrent rendering in composer

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-07-29 08:59:18 UTC (rev 11197)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-07-29 10:51:24 UTC (rev 11198)
@@ -224,6 +224,12 @@
   else if ( mComposition->plotStyle() == QgsComposition::Print ||
             mComposition->plotStyle() == QgsComposition::Postscript )
   {
+    if ( mDrawing )
+    {
+      return;
+    }
+
+    mDrawing = true;
     QPaintDevice* thePaintDevice = painter->device();
     if ( !thePaintDevice )
     {
@@ -233,6 +239,7 @@
     QRectF bRect = boundingRect();
     QSize theSize( bRect.width(), bRect.height() );
     draw( painter, mExtent, theSize, 25.4 ); //scene coordinates seem to be in mm
+    mDrawing = false;
   }
 
   drawFrame( painter );