[QGIS Commit] r13609 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-05-31 11:43:18 -0400 (Mon, 31 May 2010)
New Revision: 13609

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Fix for previous label commits

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-05-31 15:11:20 UTC (rev 13608)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-05-31 15:43:18 UTC (rev 13609)
@@ -526,7 +526,8 @@
   mMapCanvas->freeze( false );
   mMapCanvas->clearExtentHistory(); // reset zoomnext/zoomlast
   mLastComposerId = 0;
-  mLBL = new QgsPalLabeling();;
+  mLBL = new QgsPalLabeling();
+  mMapCanvas->mapRenderer()->setLabelingEngine( mLBL );
 } // QgisApp ctor
 
 
@@ -572,8 +573,6 @@
   deletePrintComposers();
   removeAnnotationItems();
 
-  delete mLBL;
-
   // delete map layer registry and provider registry
   QgsApplication::exitQgis();
 }