Fix unnecessarily fussy close() for QgsMsSqlFeatureIterator

nyalldawson · nyalldawson · commit 7cd8e38c47ad · 2017-11-19T16:28:49.000+10:00
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -425,14 +425,8 @@ bool QgsMssqlFeatureIterator::close()
   if ( mClosed )
     return false;
 
-  if ( mQuery )
+  if ( mQuery && mQuery->isActive() )
   {
-    if ( !mQuery->isActive() )
-    {
-      QgsDebugMsg( "QgsMssqlFeatureIterator::close on inactive query" );
-      return false;
-    }
-
     mQuery->finish();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -425,14 +425,8 @@ bool QgsMssqlFeatureIterator::close()`
`425`	`425`	`if ( mClosed )`
`426`	`426`	`return false;`
`427`	`427`
`428`		`- if ( mQuery )`
	`428`	`+ if ( mQuery && mQuery->isActive() )`
`429`	`429`	`{`
`430`		`- if ( !mQuery->isActive() )`
`431`		`- {`
`432`		`- QgsDebugMsg( "QgsMssqlFeatureIterator::close on inactive query" );`
`433`		`- return false;`
`434`		`- }`
`435`		`-`
`436`	`430`	`mQuery->finish();`
`437`	`431`	`}`
`438`	`432`