improve driver type detection

qgis · Aug 27, 2020 · 07c2e74 · 07c2e74
1 parent 7f2240c
commit 07c2e74
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -2282,18 +2282,17 @@ void QgsOptions::loadGdalDriverList()
     }
 
     // in GDAL 2.0 both vector and raster drivers are returned by GDALGetDriver
-    if ( QString( GDALGetMetadataItem( myGdalDriver, GDAL_DCAP_RASTER, nullptr ) ) != QLatin1String( "YES" ) )
+    myGdalDriverDescription = GDALGetDescription( myGdalDriver );
+    myDrivers << myGdalDriverDescription;
+    if ( QString( GDALGetMetadataItem( myGdalDriver, GDAL_DCAP_RASTER, nullptr ) ) == QLatin1String( "YES" ) )
     {
-      driversType[myGdalDriverDescription] = QgsMapLayerType::VectorLayer;
+      driversType[myGdalDriverDescription] = QgsMapLayerType::RasterLayer;
     }
-    else
+    else if ( QString( GDALGetMetadataItem( myGdalDriver, GDAL_DCAP_VECTOR, nullptr ) ) == QLatin1String( "YES" ) )
     {
-      driversType[myGdalDriverDescription] = QgsMapLayerType::RasterLayer;
+      driversType[myGdalDriverDescription] = QgsMapLayerType::VectorLayer;
     }
 
-    myGdalDriverDescription = GDALGetDescription( myGdalDriver );
-    myDrivers << myGdalDriverDescription;
-
     QgsDebugMsg( QStringLiteral( "driver #%1 - %2" ).arg( i ).arg( myGdalDriverDescription ) );
 
     // get driver R/W flags, adopted from GDALGeneralCmdLineProcessor()