Disable FEATURE_DATASET layer option if its value is not set

qgis · May 14, 2016 · cfb61003891a1b729868b5624da0a8df99714fcc · cfb6100
1 parent 894d520
commit cfb61003891a1b729868b5624da0a8df99714fcc
Unified Split

Showing with 7 additions and 0 deletions.

+7 −0 src/core/qgsvectorfilewriter.cpp
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -283,6 +283,13 @@ void QgsVectorFileWriter::init( QString vectorFileName, QString fileEncoding, co
   QString layerName = QFileInfo( vectorFileName ).baseName();
   OGRwkbGeometryType wkbType = ogrTypeFromWkbType( geometryType );
 
+  // Remove FEATURE_DATASET layer option (used for ESRI File GDB driver) if its value is not set
+  int optIndex = layerOptions.indexOf( "FEATURE_DATASET=" );
+  if ( optIndex != -1 )
+  {
+    layerOptions.removeAt( optIndex );
+  }
+
   if ( !layerOptions.isEmpty() )
   {
     options = new char *[ layerOptions.size()+1 ];