fix #2281

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12455 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 14, 2009 · ffd8db9 · ffd8db9
1 parent 669268f
commit ffd8db9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/app/qgsmaptooladdisland.cpp b/src/app/qgsmaptooladdisland.cpp
@@ -104,9 +104,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
 
     //close polygon
     mCaptureList.push_back( *mCaptureList.begin() );
-    vlayer->beginEditCommand( tr( "Island added" ) );
+    vlayer->beginEditCommand( tr( "Part added" ) );
     int errorCode = vlayer->addIsland( mCaptureList );
-    vlayer->endEditCommand();
     QString errorMessage;
 
     if ( errorCode != 0 )
@@ -136,6 +135,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
         errorMessage = tr( "Selected geometry could not be found" );
       }
       QMessageBox::critical( 0, tr( "Error, could not add island" ), errorMessage );
+
+      vlayer->destroyEditCommand();
     }
     else
     {
@@ -145,6 +146,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
       {
         addTopologicalPoints( mCaptureList );
       }
+
+      vlayer->endEditCommand();
     }
 
     mCaptureList.clear();

diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -83,7 +83,6 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )
 
     vlayer->beginEditCommand( tr( "Ring added" ) );
     int addRingReturnCode = vlayer->addRing( mCaptureList );
-    vlayer->endEditCommand();
     if ( addRingReturnCode != 0 )
     {
       QString errorMessage;
@@ -113,6 +112,11 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )
         errorMessage = tr( "An unknown error occured" );
       }
       QMessageBox::critical( 0, tr( "Error, could not add ring" ), errorMessage );
+      vlayer->destroyEditCommand();
+    }
+    else
+    {
+      vlayer->endEditCommand();
     }
     mCaptureList.clear();
     mCanvas->refresh();