[Geometry checker] If fixing an error produced changes, treat newly detected errors which are the same as the error fixed as actual new errors

manisandro · manisandro · commit 2f6be7a504fb · 2016-07-14T16:41:35.000+02:00
diff --git a/src/plugins/geometry_checker/qgsgeometrychecker.cpp b/src/plugins/geometry_checker/qgsgeometrychecker.cpp
@@ -155,14 +155,17 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError* error, int method )
     }
   }
 
-  // Remove just-fixed error from newly-found errors (needed in case error was fixed with "no change")
-  Q_FOREACH ( QgsGeometryCheckError* recheckErr, recheckErrors )
+  // Remove just-fixed error from newly-found errors if no changes occurred (needed in case error was fixed with "no change")
+  if ( changes.isEmpty() )
   {
-    if ( recheckErr->isEqual( error ) )
+    Q_FOREACH ( QgsGeometryCheckError* recheckErr, recheckErrors )
     {
-      recheckErrors.removeAll( recheckErr );
-      delete recheckErr;
-      break;
+      if ( recheckErr->isEqual( error ) )
+      {
+        recheckErrors.removeAll( recheckErr );
+        delete recheckErr;
+        break;
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -155,14 +155,17 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError* error, int method )`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- // Remove just-fixed error from newly-found errors (needed in case error was fixed with "no change")`
`159`		`- Q_FOREACH ( QgsGeometryCheckError* recheckErr, recheckErrors )`
	`158`	`+ // Remove just-fixed error from newly-found errors if no changes occurred (needed in case error was fixed with "no change")`
	`159`	`+ if ( changes.isEmpty() )`
`160`	`160`	`{`
`161`		`- if ( recheckErr->isEqual( error ) )`
	`161`	`+ Q_FOREACH ( QgsGeometryCheckError* recheckErr, recheckErrors )`
`162`	`162`	`{`
`163`		`- recheckErrors.removeAll( recheckErr );`
`164`		`- delete recheckErr;`
`165`		`- break;`
	`163`	`+ if ( recheckErr->isEqual( error ) )`
	`164`	`+ {`
	`165`	`+ recheckErrors.removeAll( recheckErr );`
	`166`	`+ delete recheckErr;`
	`167`	`+ break;`
	`168`	`+ }`
`166`	`169`	`}`
`167`	`170`	`}`
`168`	`171`