Fix crash in attributetable when removing more than one column

signedav · m-kuhn · commit 02179adf9215 · 2017-07-18T09:59:09.000+02:00
References #16746
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -196,7 +196,8 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa
     {
       if ( newColumnMapping.size() == mColumnMapping.size() - removedColumnCount )
       {
-        beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn );
+        //the amount of removed column in the model need to be equal removedColumnCount
+        beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn+removedColumnCount-1 );
         mColumnMapping = newColumnMapping;
         endRemoveColumns();
       }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa`
`196`	`196`	`{`
`197`	`197`	`if ( newColumnMapping.size() == mColumnMapping.size() - removedColumnCount )`
`198`	`198`	`{`
`199`		`- beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn );`
	`199`	`+ //the amount of removed column in the model need to be equal removedColumnCount`
	`200`	`+ beginRemoveColumns( QModelIndex(), firstRemovedColumn, firstRemovedColumn+removedColumnCount-1 );`
`200`	`201`	`mColumnMapping = newColumnMapping;`
`201`	`202`	`endRemoveColumns();`
`202`	`203`	`}`