Merge pull request #818 from 3nids/undodigitize

NathanW2 · NathanW2 · commit 5fb53d866824 · 2013-08-16T03:09:48.000-07:00
fix crash at undo in digitize
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -245,11 +245,11 @@ void QgsMapToolCapture::undo()
 
     mRubberBand->removePoint( -1 );
 
-    if ( rubberBandSize > 0 )
+    if ( rubberBandSize > 1 )
     {
       if ( tempRubberBandSize > 1 )
       {
-        const QgsPoint *point = mRubberBand->getPoint( 0, rubberBandSize - 1 );
+        const QgsPoint *point = mRubberBand->getPoint( 0, rubberBandSize - 2 );
         mTempRubberBand->movePoint( tempRubberBandSize - 2, *point );
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -245,11 +245,11 @@ void QgsMapToolCapture::undo()`
`245`	`245`
`246`	`246`	`mRubberBand->removePoint( -1 );`
`247`	`247`
`248`		`- if ( rubberBandSize > 0 )`
	`248`	`+ if ( rubberBandSize > 1 )`
`249`	`249`	`{`
`250`	`250`	`if ( tempRubberBandSize > 1 )`
`251`	`251`	`{`
`252`		`- const QgsPoint *point = mRubberBand->getPoint( 0, rubberBandSize - 1 );`
	`252`	`+ const QgsPoint *point = mRubberBand->getPoint( 0, rubberBandSize - 2 );`
`253`	`253`	`mTempRubberBand->movePoint( tempRubberBandSize - 2, *point );`
`254`	`254`	`}`
`255`	`255`	`}`