From 88e1d7afde8be510c42e6b5f0939f04e92042205 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2015 00:17:40 +0100 Subject: [PATCH] Don't keep dangling pointers in QgisApp::mPrintComposers --- src/app/qgisapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index bc401ebe0e61..53af25473d5a 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -5667,7 +5667,7 @@ bool QgisApp::loadComposersFromProject( const QDomDocument& doc ) void QgisApp::deletePrintComposers() { QSet::iterator it = mPrintComposers.begin(); - for ( ; it != mPrintComposers.end(); ++it ) + while ( it != mPrintComposers.end() ) { emit composerWillBeRemoved(( *it )->view() ); @@ -5683,8 +5683,8 @@ void QgisApp::deletePrintComposers() { delete composition; } + it = mPrintComposers.erase( it ); } - mPrintComposers.clear(); mLastComposerId = 0; markDirty(); }