Fix a crash in Symbol properties dialog when removed a layer. (#2995)

wonder · wonder · commit 1f5d4bae24b7 · 2010-11-12T11:25:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14553 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp b/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
@@ -355,11 +355,16 @@ void QgsSymbolV2PropertiesDialog::removeLayer()
 {
   int idx = currentLayerIndex();
   if ( idx < 0 ) return;
+  int row = currentRowIndex();
   mSymbol->deleteSymbolLayer( idx );
 
   loadSymbol();
 
   updateUi();
+
+  // set previous layer as active
+  QModelIndex newIndex = listLayers->model()->index( qMin(row, mSymbol->symbolLayerCount()-1), 0 );
+  listLayers->setCurrentIndex( newIndex );
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -355,11 +355,16 @@ void QgsSymbolV2PropertiesDialog::removeLayer()`
`355`	`355`	`{`
`356`	`356`	`int idx = currentLayerIndex();`
`357`	`357`	`if ( idx < 0 ) return;`
	`358`	`+ int row = currentRowIndex();`
`358`	`359`	`mSymbol->deleteSymbolLayer( idx );`
`359`	`360`
`360`	`361`	`loadSymbol();`
`361`	`362`
`362`	`363`	`updateUi();`
	`364`	`+`
	`365`	`+ // set previous layer as active`
	`366`	`+ QModelIndex newIndex = listLayers->model()->index( qMin(row, mSymbol->symbolLayerCount()-1), 0 );`
	`367`	`+ listLayers->setCurrentIndex( newIndex );`
`363`	`368`	`}`
`364`	`369`
`365`	`370`