don't break existing configuration

Introduce new skipDrivers setting to store comma separated list of disabled drivers. If this new setting does not exists in the QGIS settings then disabled drivers will be loaded from old skipList setting.
qgis · Aug 27, 2020 · ecc2963 · ecc2963
1 parent 07c2e74
commit ecc2963
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1675,19 +1675,29 @@ void QgsApplication::setSkippedGdalDrivers( const QStringList &skippedGdalDriver
   *sDeferredSkippedGdalDrivers() = deferredSkippedGdalDrivers;
 
   QgsSettings settings;
-  settings.setValue( QStringLiteral( "gdal/skipList" ), skippedGdalDrivers.join( QStringLiteral( "," ) ) );
+  settings.setValue( QStringLiteral( "gdal/skipDrivers" ), skippedGdalDrivers.join( QStringLiteral( "," ) ) );
 
   applyGdalSkippedDrivers();
 }
 
 void QgsApplication::registerGdalDriversFromSettings()
 {
   QgsSettings settings;
-  QString joinedList = settings.value( QStringLiteral( "gdal/skipList" ), QString() ).toString();
+  QString joinedList, delimiter;
+  if ( settings.contains( QStringLiteral( "gdal/skipDrivers" ) ) )
+  {
+    joinedList = settings.value( QStringLiteral( "gdal/skipDrivers" ), QString() ).toString();
+    delimiter = QStringLiteral( "," );
+  }
+  else
+  {
+    joinedList = settings.value( QStringLiteral( "gdal/skipList" ), QString() ).toString();
+    delimiter = QStringLiteral( " " );
+  }
   QStringList myList;
   if ( !joinedList.isEmpty() )
   {
-    myList = joinedList.split( QStringLiteral( "," ) );
+    myList = joinedList.split( delimiter );
   }
   *sGdalSkipList() = myList;
   applyGdalSkippedDrivers();