From 65141e29eec30e8f70d42d3f6df3b160c5d65c57 Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco@sourcepole.ch>
Date: Tue, 9 Oct 2012 09:46:03 +0200
Subject: [PATCH] Fix cleanup of map composition. Fixes ticket #6440

---
 src/app/composer/qgscomposer.cpp | 5 -----
 src/app/composer/qgscomposer.h   | 2 +-
 src/app/qgisapp.cpp              | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index ed594cba3b3b..9760d87d1dd2 100644
--- 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
index 29d4a6827621..ce50a4b493a9 100644
--- 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
index f7f84a22057b..5739c1df06f2 100644
--- 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();