fix #2025

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11824 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 21, 2009 · 4dd9ac6 · 4dd9ac6
1 parent b5698ba
commit 4dd9ac6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5577,8 +5577,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       }
 
       //merge tool needs editable layer and provider with the capability of adding and deleting features
-      if ( vlayer->isEditable() && ( dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) \
-           &&  QgsVectorDataProvider::AddFeatures )
+      if ( vlayer->isEditable() &&
+           (dprovider->capabilities() & QgsVectorDataProvider::DeleteFeatures) &&
+           (dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues) &&
+           (dprovider->capabilities() & QgsVectorDataProvider::AddFeatures) )
       {
         mActionMergeFeatures->setEnabled( layerHasSelection );
       }