[Backport]: disable abort if avoid intersections returns a different …

…geometry type (e.g. multitype instead of singletype). Temporary solution for ticket #4880
qgis · Jan 31, 2012 · 17c87e1 · 17c87e1
1 parent 60df735
commit 17c87e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -409,14 +409,14 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
         {
           //not a polygon type. Impossible to get there
         }
-        else if ( avoidIntersectionsReturn == 2 )
+        /*else if ( avoidIntersectionsReturn == 2 ) //MH120131: disable this error message until there is a better way to cope with the single type / multi type problem
         {
           //bail out...
           QMessageBox::critical( 0, tr( "Error" ), tr( "The feature could not be added because removing the polygon intersections would change the geometry type" ) );
           delete f;
           stopCapturing();
           return;
-        }
+        }*/
         else if ( avoidIntersectionsReturn == 3 )
         {
           QMessageBox::critical( 0, tr( "Error" ), tr( "An error was reported during intersection removal" ) );