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

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-10-25 12:13:49 -0400 (Sun, 25 Oct 2009)
New Revision: 11842

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Ensure the vector editing icon stays in a consistent state

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-10-25 15:55:40 UTC (rev 11841)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-10-25 16:13:49 UTC (rev 11842)
@@ -4557,6 +4557,7 @@
     }
     else //cancel
     {
+      mActionToggleEditing->setChecked( vlayer->isEditable() );
       return;
     }
   }
@@ -4566,8 +4567,12 @@
   }
 
   if ( layer == mMapLegend->currentLayer() )
+  {
     activateDeactivateLayerRelatedActions( layer );
+  }
 
+  //ensure the toolbar icon state is consistent with the layer editing state
+  mActionToggleEditing->setChecked( vlayer->isEditable() );
   vlayer->triggerRepaint();
 }