QgsAttributeTableFilterModel::headerData(): fix crash on layer with no field

rouault · rouault · commit 1cd78083f868 · 2016-06-20T12:55:17.000+02:00
Fix crash on qgis_attributetabletest and when displaying the attribute table of a layer without any attribute field. Was likely introduced in 4a3a814, so master only
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -101,7 +101,7 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation
       return section + 1;
     else
     {
-      int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();
+      int sourceSection = mapToSource( index( section, ( !mColumnMapping.isEmpty() && mColumnMapping.at( 0 ) == -1 ) ? 1 : 0 ) ).row();
       return sourceModel()->headerData( sourceSection, orientation, role );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ QVariant QgsAttributeTableFilterModel::headerData( int section, Qt::Orientation`
`101`	`101`	`return section + 1;`
`102`	`102`	`else`
`103`	`103`	`{`
`104`		`- int sourceSection = mapToSource( index( section, mColumnMapping.at( 0 ) == -1 ? 1 : 0 ) ).row();`
	`104`	`+ int sourceSection = mapToSource( index( section, ( !mColumnMapping.isEmpty() && mColumnMapping.at( 0 ) == -1 ) ? 1 : 0 ) ).row();`
`105`	`105`	`return sourceModel()->headerData( sourceSection, orientation, role );`
`106`	`106`	`}`
`107`	`107`	`}`