Really fix snapping indexing crash

m-kuhn · m-kuhn · commit 2acf7a86b992 · 2015-09-14T10:07:52.000+02:00
diff --git a/src/gui/qgsmapcanvassnappingutils.cpp b/src/gui/qgsmapcanvassnappingutils.cpp
@@ -38,8 +38,11 @@ void QgsMapCanvasSnappingUtils::prepareIndexStarting( int count )
 
 void QgsMapCanvasSnappingUtils::prepareIndexProgress( int index )
 {
+  if ( !mProgress )
+    return;
+
   mProgress->setValue( index );
-  if ( mProgress && index == mProgress->maximum() )
+  if ( index == mProgress->maximum() )
   {
     delete mProgress;
     mProgress = 0;

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,11 @@ void QgsMapCanvasSnappingUtils::prepareIndexStarting( int count )`
`38`	`38`
`39`	`39`	`void QgsMapCanvasSnappingUtils::prepareIndexProgress( int index )`
`40`	`40`	`{`
	`41`	`+ if ( !mProgress )`
	`42`	`+ return;`
	`43`	`+`
`41`	`44`	`mProgress->setValue( index );`
`42`		`- if ( mProgress && index == mProgress->maximum() )`
	`45`	`+ if ( index == mProgress->maximum() )` Code has comments. Press enter to view.
`43`	`46`	`{`
`44`	`47`	`delete mProgress;`
`45`	`48`	`mProgress = 0;`