Skip to content
Permalink
Browse files

[bugfix] Bookmrks fix crash on exit when docked

Order of destruction does matter

Fixes #17673
  • Loading branch information
elpaso committed Dec 23, 2017
1 parent 2872f69 commit 63cf7ae6031dbd63212db07c8a3cd4a05452372a
Showing with 2 additions and 1 deletion.
  1. +2 −1 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();
}

0 comments on commit 63cf7ae

Please sign in to comment.
You can’t perform that action at this time.