Ensure browser model is initialized when used by QgsDataSourceSelectD…

…ialog
qgis · Jan 29, 2020 · e8a6c2b · e8a6c2b
1 parent 7204de2
commit e8a6c2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/gui/qgsdatasourceselectdialog.cpp b/src/gui/qgsdatasourceselectdialog.cpp
@@ -35,21 +35,20 @@ QgsDataSourceSelectDialog::QgsDataSourceSelectDialog(
 {
   if ( ! browserModel )
   {
-    mBrowserModel = qgis::make_unique<QgsBrowserGuiModel>();
+    mBrowserModel = new QgsBrowserGuiModel( this );
     mBrowserModel->initialize();
-    mOwnModel = true;
   }
   else
   {
-    mBrowserModel.reset( browserModel );
-    mOwnModel = false;
+    mBrowserModel = browserModel;
+    mBrowserModel->initialize();
   }
 
   setupUi( this );
   setWindowTitle( tr( "Select a Data Source" ) );
   QgsGui::enableAutoGeometryRestore( this );
 
-  mBrowserProxyModel.setBrowserModel( mBrowserModel.get() );
+  mBrowserProxyModel.setBrowserModel( mBrowserModel );
   mBrowserTreeView->setHeaderHidden( true );
 
   if ( setFilterByLayerType )
@@ -63,7 +62,7 @@ QgsDataSourceSelectDialog::QgsDataSourceSelectDialog(
     buttonBox->button( QDialogButtonBox::StandardButton::Ok )->setEnabled( false );
   }
 
-  mBrowserTreeView->setBrowserModel( mBrowserModel.get() );
+  mBrowserTreeView->setBrowserModel( mBrowserModel );
 
   mWidgetFilter->hide();
   mLeFilter->setPlaceholderText( tr( "Type here to filter visible items…" ) );
@@ -116,12 +115,7 @@ QgsDataSourceSelectDialog::QgsDataSourceSelectDialog(
   }
 }
 
-QgsDataSourceSelectDialog::~QgsDataSourceSelectDialog()
-{
-  if ( ! mOwnModel )
-    mBrowserModel.release();
-}
-
+QgsDataSourceSelectDialog::~QgsDataSourceSelectDialog() = default;
 
 void QgsDataSourceSelectDialog::showEvent( QShowEvent *e )
 {

diff --git a/src/gui/qgsdatasourceselectdialog.h b/src/gui/qgsdatasourceselectdialog.h
@@ -106,8 +106,7 @@ class GUI_EXPORT QgsDataSourceSelectDialog: public QDialog, private Ui::QgsDataS
     void refreshModel( const QModelIndex &index );
 
     QgsBrowserProxyModel mBrowserProxyModel;
-    std::unique_ptr<QgsBrowserGuiModel> mBrowserModel;
-    bool mOwnModel = true;
+    QgsBrowserGuiModel *mBrowserModel = nullptr;
     QgsMimeDataUtils::Uri mUri;
     QLabel *mDescriptionLabel = nullptr;