Fix cleanup of map composition. Fixes ticket #6440

qgis · Oct 9, 2012 · 65141e2 · 65141e2
1 parent a49a431
commit 65141e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -505,11 +505,6 @@ QgsComposerView *QgsComposer::view( void )
   return mView;
 }
 
-/*QgsComposition *QgsComposer::composition(void)
-{
-  return mComposition;
-  }*/
-
 void QgsComposer::zoomFull( void )
 {
   if ( mView )

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -78,7 +78,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QgsComposerView *view( void );
 
     //! Return current composition
-    //QgsComposition *composition(void);
+    QgsComposition* composition(void){ return mComposition; }
 
     //! Restore the window and toolbar state
     void restoreWindowState();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4422,6 +4422,7 @@ void QgisApp::deletePrintComposers()
   for ( ; it != mPrintComposers.end(); ++it )
   {
     emit composerWillBeRemoved(( *it )->view() );
+    delete ( (*it)->composition() );
     delete( *it );
   }
   mPrintComposers.clear();