close driver if attributes are missing

rblazek · rblazek · commit be3ab6f9818c · 2006-12-21T18:00:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6293 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1974,6 +1974,7 @@ std::vector<QgsFeatureAttribute> *QgsGrassProvider::attributes ( int field, int
     #endif
 
     if ( nRecords < 1 ) {
+	db_close_database_shutdown_driver ( driver );
         std::cerr << "No DB record" << std::endl;
 	return att;
     }
@@ -1983,6 +1984,7 @@ std::vector<QgsFeatureAttribute> *QgsGrassProvider::attributes ( int field, int
 
     int more;
     if ( db_fetch (&databaseCursor, DB_NEXT, &more) != DB_OK ) {
+	db_close_database_shutdown_driver ( driver );
 	std::cout << "Cannot fetch DB record" << std::endl;
 	return att;
     }

Original file line number	Diff line number	Diff line change
`@@ -1974,6 +1974,7 @@ std::vector<QgsFeatureAttribute> *QgsGrassProvider::attributes ( int field, int`
`1974`	`1974`	`#endif`
`1975`	`1975`
`1976`	`1976`	`if ( nRecords < 1 ) {`
	`1977`	`+ db_close_database_shutdown_driver ( driver );`
`1977`	`1978`	`std::cerr << "No DB record" << std::endl;`
`1978`	`1979`	`return att;`
`1979`	`1980`	`}`
`@@ -1983,6 +1984,7 @@ std::vector<QgsFeatureAttribute> *QgsGrassProvider::attributes ( int field, int`
`1983`	`1984`
`1984`	`1985`	`int more;`
`1985`	`1986`	`if ( db_fetch (&databaseCursor, DB_NEXT, &more) != DB_OK ) {`
	`1987`	`+ db_close_database_shutdown_driver ( driver );`
`1986`	`1988`	`std::cout << "Cannot fetch DB record" << std::endl;`
`1987`	`1989`	`return att;`
`1988`	`1990`	`}`