Undo changes in active edit command when it gets destroyed.

Fixed return value for deletion of vertices. Contributed by Richard Kostecky. git-svn-id: http://svn.osgeo.org/qgis/trunk@11143 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 22, 2009 · 0054b7a · 0054b7a
1 parent 2fc5e73
commit 0054b7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -422,7 +422,7 @@ public:
     /** Finish edit command and add it to undo/redo stack */
     void endEditCommand();
 
-    /** Destroy active command and deletes all changes in it */
+    /** Destroy active command and reverts all changes in it */
     void destroyEditCommand();
 
     /** Execute undo operation. To be called only from QgsVectorLayerUndoCommand. */

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1558,7 +1558,10 @@ bool QgsVectorLayer::deleteVertex( int atFeatureId, int atVertex )
       geometry = mChangedGeometries[atFeatureId];
     }
 
-    geometry.deleteVertex( atVertex );
+    if (!geometry.deleteVertex( atVertex ))
+    {
+      return false;
+    }
     mCachedGeometries[atFeatureId] = geometry;
     editGeometryChange( atFeatureId, geometry );
 
@@ -3885,6 +3888,7 @@ void QgsVectorLayer::destroyEditCommand()
 {
   if ( mActiveCommand != NULL )
   {
+    undoEditCommand( mActiveCommand );
     delete mActiveCommand;
     mActiveCommand = NULL;
   }

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -485,7 +485,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Finish edit command and add it to undo/redo stack */
     void endEditCommand();
 
-    /** Destroy active command and deletes all changes in it */
+    /** Destroy active command and reverts all changes in it */
     void destroyEditCommand();
 
     /** Execute undo operation. To be called only from QgsVectorLayerUndoCommand. */