Skip to content

Commit

Permalink
Merge pull request #5941 from elpaso/bugfix-17673-bookmarks--crash-wh…
Browse files Browse the repository at this point in the history
…en-docked

[bugfix] Bookmarks fix crash on exit when docked
  • Loading branch information
elpaso authored Dec 23, 2017
2 parents 2872f69 + 63cf7ae commit 7871071
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/app/qgsbookmarks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down Expand Up @@ -136,6 +136,7 @@ QgsBookmarks::QgsBookmarks( QWidget *parent )
QgsBookmarks::~QgsBookmarks()
{
delete mQgisModel;
delete mProxyModel;
QSqlDatabase::removeDatabase( QStringLiteral( "bookmarks" ) );
saveWindowLocation();
}
Expand Down

0 comments on commit 7871071

Please sign in to comment.