Fix #11426 (Right click cause crash when digitizing polygon inner ring)

Also fixed the same crash for add part and fill ring map tools.
qgis · Oct 20, 2014 · fb32178 · fb32178
1 parent d11597a
commit fb32178
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
@@ -115,6 +115,11 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e )
         return;
       }
 
+      if ( !isCapturing() )
+        return;
+
+      // we are now going to finish the capturing
+
       if ( mode() == CapturePolygon )
       {
         //close polygon

diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -72,6 +72,9 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )
   }
   else if ( e->button() == Qt::RightButton )
   {
+    if ( !isCapturing() )
+      return;
+
     deleteTempRubberBand();
 
     closePolygon();

diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -268,6 +268,11 @@ void QgsMapToolCapture::startCapturing()
   mCapturing = true;
 }
 
+bool QgsMapToolCapture::isCapturing() const
+{
+  return mCapturing;
+}
+
 void QgsMapToolCapture::stopCapturing()
 {
   if ( mRubberBand )

diff --git a/src/app/qgsmaptoolcapture.h b/src/app/qgsmaptoolcapture.h
@@ -79,6 +79,7 @@ class APP_EXPORT QgsMapToolCapture : public QgsMapToolEdit
     void undo();
 
     void startCapturing();
+    bool isCapturing() const;
     void stopCapturing();
     void deleteTempRubberBand();
 

diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp
@@ -73,6 +73,9 @@ void QgsMapToolFillRing::canvasReleaseEvent( QMouseEvent * e )
   }
   else if ( e->button() == Qt::RightButton )
   {
+    if ( !isCapturing() )
+      return;
+
     deleteTempRubberBand();
 
     closePolygon();