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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-07-28 04:04:26 -0400 (Tue, 28 Jul 2009)
New Revision: 11190

Modified:
   trunk/qgis/src/core/composer/qgscomposermap.cpp
Log:
Slightly better fix for composer map crash

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-07-28 02:51:08 UTC (rev 11189)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-07-28 08:04:26 UTC (rev 11190)
@@ -103,13 +103,6 @@
     return;
   }
 
-  if ( mDrawing )
-  {
-    return;
-  }
-
-  mDrawing = true;
-
   QgsMapRenderer theMapRenderer;
   theMapRenderer.setExtent( extent );
   theMapRenderer.setOutputSize( size, dpi );
@@ -145,8 +138,6 @@
   theMapRenderer.setScale( scale() );
   theMapRenderer.render( painter );
   theMapRenderer.setScale( bk_scale );
-
-  mDrawing = false;
 }
 
 void QgsComposerMap::cache( void )
@@ -156,6 +147,13 @@
     return;
   }
 
+  if ( mDrawing )
+  {
+    return;
+  }
+
+  mDrawing = true;
+
   int w = rect().width() * horizontalViewScaleFactor();
   int h = rect().height() * horizontalViewScaleFactor();
 
@@ -181,6 +179,8 @@
   draw( &p, mExtent, QSize( w, h ), mCacheImage.logicalDpiX() );
   p.end();
   mCacheUpdated = true;
+
+  mDrawing = false;
 }
 
 void QgsComposerMap::paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget )
@@ -307,7 +307,7 @@
 
 void QgsComposerMap::zoomContent( int delta, double x, double y )
 {
-  if(mDrawing)
+  if ( mDrawing )
   {
     return;
   }