Fix asserts when beginRemoveRows has no rows

elpaso · elpaso · commit d0a8891a0550 · 2017-12-12T14:48:14.000+01:00
This was hitting an assert in Qt Core
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -501,7 +501,7 @@ void QgsLayerTreeModel::refreshLayerLegend( QgsLayerTreeLayer *nodeLayer )
 
   // update children
   int oldNodeCount = rowCount( idx );
-  beginRemoveRows( idx, 0, oldNodeCount - 1 );
+  beginRemoveRows( idx, 0, std::max( oldNodeCount - 1, 0 ) );
   removeLegendFromLayer( nodeLayer );
   endRemoveRows();
 
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -58,7 +58,7 @@ void QgsCategorizedSymbolRendererModel::setRenderer( QgsCategorizedSymbolRendere
 {
   if ( mRenderer )
   {
-    beginRemoveRows( QModelIndex(), 0, mRenderer->categories().size() - 1 );
+    beginRemoveRows( QModelIndex(), 0, std::max( mRenderer->categories().size() - 1, 0 ) );
     mRenderer = nullptr;
     endRemoveRows();
   }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void QgsCategorizedSymbolRendererModel::setRenderer( QgsCategorizedSymbolRendere`
`58`	`58`	`{`
`59`	`59`	`if ( mRenderer )`
`60`	`60`	`{`
`61`		`- beginRemoveRows( QModelIndex(), 0, mRenderer->categories().size() - 1 );`
	`61`	`+ beginRemoveRows( QModelIndex(), 0, std::max( mRenderer->categories().size() - 1, 0 ) );`
`62`	`62`	`mRenderer = nullptr;`
`63`	`63`	`endRemoveRows();`
`64`	`64`	`}`