Fix crash when disabling defined sort order in attribute table

qgis · Jun 16, 2020 · 05f4359 · 05f4359
1 parent 300fc9e
commit 05f4359
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -78,10 +78,16 @@ void QgsAttributeTableFilterModel::sort( int column, Qt::SortOrder order )
 {
   if ( order != Qt::AscendingOrder && order != Qt::DescendingOrder )
     order = Qt::AscendingOrder;
-
-  int myColumn = mColumnMapping.at( column );
-  masterModel()->prefetchColumnData( myColumn );
-  QSortFilterProxyModel::sort( myColumn, order );
+  if ( column < 0 || column >= mColumnMapping.size() )
+  {
+    sort( QString() );
+  }
+  else
+  {
+    int myColumn = mColumnMapping.at( column );
+    masterModel()->prefetchColumnData( myColumn );
+    QSortFilterProxyModel::sort( myColumn, order );
+  }
   emit sortColumnChanged( column, order );
 }
 

diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -108,6 +108,8 @@ void QgsAttributeTableView::setAttributeTableConfig( const QgsAttributeTableConf
     i++;
   }
   mConfig = config;
+  if ( config.sortExpression().isEmpty() )
+    horizontalHeader()->setSortIndicatorShown( false );
 }
 
 QList<QgsFeatureId> QgsAttributeTableView::selectedFeaturesIds() const