Merge pull request #5941 from elpaso/bugfix-17673-bookmarks--crash-wh…

…en-docked [bugfix] Bookmarks fix crash on exit when docked
qgis · Dec 23, 2017 · 7871071 · 7871071
2 parents 2872f69 + 63cf7ae
commit 7871071
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -107,7 +107,7 @@ QgsBookmarks::QgsBookmarks( QWidget *parent )
   mProjectModel = new QgsProjectBookmarksTableModel( this );
   mMergedModel = new QgsMergedBookmarksTableModel( *mQgisModel, *mProjectModel, lstBookmarks, this );
 
-  mProxyModel = new QgsBookmarksProxyModel( this );
+  mProxyModel = new QgsBookmarksProxyModel( );
   mProxyModel->setSourceModel( mMergedModel );
   mProxyModel->setSortCaseSensitivity( Qt::CaseInsensitive );
 
@@ -136,6 +136,7 @@ QgsBookmarks::QgsBookmarks( QWidget *parent )
 QgsBookmarks::~QgsBookmarks()
 {
   delete mQgisModel;
+  delete mProxyModel;
   QSqlDatabase::removeDatabase( QStringLiteral( "bookmarks" ) );
   saveWindowLocation();
 }