[QGIS Commit] r11824 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-10-21 07:22:09 -0400 (Wed, 21 Oct 2009)
New Revision: 11824

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
fix #2025

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-10-20 19:24:51 UTC (rev 11823)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-10-21 11:22:09 UTC (rev 11824)
@@ -5577,8 +5577,10 @@
       }
 
       //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 );
       }