Fix for #1779.

rugginoso · rugginoso · commit 44f7d4158e87 · 2009-07-15T11:09:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11083 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -834,7 +834,7 @@ void QgsGrassMapcalc::updateMaps()
   QgsDebugMsg( "entered." );
   QString current = mMapComboBox->currentText();
   mMapComboBox->clear();
-  mMaps.resize( 0 );
+  mMaps.clear();
 
   QgsMapCanvas *canvas = mIface->mapCanvas();
 
@@ -882,7 +882,7 @@ void QgsGrassMapcalc::updateMaps()
     //if ( mUpdate && mapset != QgsGrass::getDefaultMapset() ) continue;
 
     mMapComboBox->addItem( layer->name() );
-    if ( layer->name() == current ) mMapComboBox->setItemText( mMapComboBox->currentIndex(), current );
+    //if ( layer->name() == current ) mMapComboBox->setItemText( mMapComboBox->currentIndex(), current );
     mMaps.push_back( map + "@" + mapset );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ void QgsGrassMapcalc::updateMaps()`
`834`	`834`	`QgsDebugMsg( "entered." );`
`835`	`835`	`QString current = mMapComboBox->currentText();`
`836`	`836`	`mMapComboBox->clear();`
`837`		`- mMaps.resize( 0 );`
	`837`	`+ mMaps.clear();`
`838`	`838`
`839`	`839`	`QgsMapCanvas *canvas = mIface->mapCanvas();`
`840`	`840`
`@@ -882,7 +882,7 @@ void QgsGrassMapcalc::updateMaps()`
`882`	`882`	`//if ( mUpdate && mapset != QgsGrass::getDefaultMapset() ) continue;`
`883`	`883`
`884`	`884`	`mMapComboBox->addItem( layer->name() );`
`885`		`- if ( layer->name() == current ) mMapComboBox->setItemText( mMapComboBox->currentIndex(), current );`
	`885`	`+ //if ( layer->name() == current ) mMapComboBox->setItemText( mMapComboBox->currentIndex(), current );`
`886`	`886`	`mMaps.push_back( map + "@" + mapset );`
`887`	`887`	`}`
`888`	`888`	`}`