fix for ticket #1617, wrong maps associated with combobox after update (added layer)

rblazek · rblazek · commit 53732c03632a · 2009-05-18T09:34:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10812 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -2317,7 +2317,7 @@ void QgsGrassModuleInput::updateQgisLayers()
                       + " " + grassLayer + " " + type + " )";
 
       mLayerComboBox->addItem( label );
-      if ( label == current ) mLayerComboBox->setItemText( mLayerComboBox->currentIndex(), current );
+      if ( label == current ) mLayerComboBox->setCurrentIndex ( mLayerComboBox->count()-1 );
 
       mMapLayers.push_back( vector );
       mVectorLayerNames.push_back( grassLayer );
@@ -2366,7 +2366,7 @@ void QgsGrassModuleInput::updateQgisLayers()
       QString label = layer->name() + " ( " + map + "@" + mapset + " )";
 
       mLayerComboBox->addItem( label );
-      if ( label == current ) mLayerComboBox->setItemText( mLayerComboBox->currentIndex(), current );
+      if ( label == current ) mLayerComboBox->setCurrentIndex ( mLayerComboBox->count()-1 );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2317,7 +2317,7 @@ void QgsGrassModuleInput::updateQgisLayers()`
`2317`	`2317`	`+ " " + grassLayer + " " + type + " )";`
`2318`	`2318`
`2319`	`2319`	`mLayerComboBox->addItem( label );`
`2320`		`- if ( label == current ) mLayerComboBox->setItemText( mLayerComboBox->currentIndex(), current );`
	`2320`	`+ if ( label == current ) mLayerComboBox->setCurrentIndex ( mLayerComboBox->count()-1 );`
`2321`	`2321`
`2322`	`2322`	`mMapLayers.push_back( vector );`
`2323`	`2323`	`mVectorLayerNames.push_back( grassLayer );`
`@@ -2366,7 +2366,7 @@ void QgsGrassModuleInput::updateQgisLayers()`
`2366`	`2366`	`QString label = layer->name() + " ( " + map + "@" + mapset + " )";`
`2367`	`2367`
`2368`	`2368`	`mLayerComboBox->addItem( label );`
`2369`		`- if ( label == current ) mLayerComboBox->setItemText( mLayerComboBox->currentIndex(), current );`
	`2369`	`+ if ( label == current ) mLayerComboBox->setCurrentIndex ( mLayerComboBox->count()-1 );`
`2370`	`2370`	`}`
`2371`	`2371`	`}`
`2372`	`2372`	`}`