[MSSQL] Close database and delete query on close

NathanW2 · NathanW2 · commit 8c4bfa3f6093 · 2014-03-26T11:30:50.000+10:00
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -55,12 +55,6 @@ QgsMssqlFeatureIterator::QgsMssqlFeatureIterator( QgsMssqlFeatureSource* source,
 QgsMssqlFeatureIterator::~QgsMssqlFeatureIterator()
 {
   close();
-
-  if ( mQuery )
-      delete mQuery;
-
-  if (mDatabase.isOpen())
-    mDatabase.close();
 }
 
 void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest& request )
@@ -224,6 +218,9 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
 
 bool QgsMssqlFeatureIterator::rewind()
 {
+  if ( mClosed )
+    return false;
+
   if ( mStatement.isEmpty() )
   {
     QgsDebugMsg( "QgsMssqlFeatureIterator::rewind on empty statement" );
@@ -260,6 +257,12 @@ bool QgsMssqlFeatureIterator::close()
       mQuery->finish();
   }
 
+  if ( mQuery )
+      delete mQuery;
+
+  if (mDatabase.isOpen())
+    mDatabase.close();
+
   iteratorClosed();
 
   mClosed = true;
