Fix #8852 (crash when removing invalid postgres table from project)

wonder-sk · wonder-sk · commit f15c8869407c · 2014-02-09T15:59:43.000+07:00
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -50,8 +50,6 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
 {
   mCursorName = QString( "qgisf%1_%2" ).arg( P->mProviderId ).arg( P->mIteratorCounter++ );
 
-  P->mActiveIterators << this;
-
   QString whereClause;
 
   if ( request.filterType() == QgsFeatureRequest::FilterRect && !P->mGeometryColumn.isNull() )
@@ -81,6 +79,8 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
     return;
   }
 
+  P->mActiveIterators << this;
+
   mFetched = 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,`
`50`	`50`	`{`
`51`	`51`	`mCursorName = QString( "qgisf%1_%2" ).arg( P->mProviderId ).arg( P->mIteratorCounter++ );`
`52`	`52`
`53`		`- P->mActiveIterators << this;`
`54`		`-`
`55`	`53`	`QString whereClause;`
`56`	`54`
`57`	`55`	`if ( request.filterType() == QgsFeatureRequest::FilterRect && !P->mGeometryColumn.isNull() )`
`@@ -81,6 +79,8 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,`
`81`	`79`	`return;`
`82`	`80`	`}`
`83`	`81`
	`82`	`+ P->mActiveIterators << this;`
	`83`	`+`
`84`	`84`	`mFetched = 0;`
`85`	`85`	`}`
`86`	`86`