[Fix #7784] Browser keeps crashing when navigating the tree

m-kuhn · m-kuhn · commit 110b87e6a697 · 2013-05-13T10:31:09.000+02:00
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -120,11 +120,16 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel* filterModel
   QTableView::setModel( filterModel );
 
   delete mFeatureSelectionModel;
-  mFeatureSelectionModel = new QgsFeatureSelectionModel( mFilterModel, mFilterModel, mFilterModel->layer(), mFilterModel );
-  setSelectionModel( mFeatureSelectionModel );
-  mTableDelegate->setFeatureSelectionModel( mFeatureSelectionModel );
-  connect( mFeatureSelectionModel, SIGNAL( requestRepaint( QModelIndexList ) ), this, SLOT( repaintRequested( QModelIndexList ) ) );
-  connect( mFeatureSelectionModel, SIGNAL( requestRepaint() ), this, SLOT( repaintRequested() ) );
+  mFeatureSelectionModel = NULL;
+
+  if ( filterModel )
+  {
+    mFeatureSelectionModel = new QgsFeatureSelectionModel( mFilterModel, mFilterModel, mFilterModel->layer(), mFilterModel );
+    setSelectionModel( mFeatureSelectionModel );
+    mTableDelegate->setFeatureSelectionModel( mFeatureSelectionModel );
+    connect( mFeatureSelectionModel, SIGNAL( requestRepaint( QModelIndexList ) ), this, SLOT( repaintRequested( QModelIndexList ) ) );
+    connect( mFeatureSelectionModel, SIGNAL( requestRepaint() ), this, SLOT( repaintRequested() ) );
+  }
 }
 
 void QgsAttributeTableView::closeEvent( QCloseEvent *e )
