fix locator settings migration

qgis · Jan 31, 2023 · 947e9f4 · 947e9f4
1 parent 10748bd
commit 947e9f4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/core/settings/qgssettingsregistrycore.cpp b/src/core/settings/qgssettingsregistrycore.cpp
@@ -145,12 +145,17 @@ void QgsSettingsRegistryCore::migrateOldSettings()
   {
     QgsSettings settings;
     settings.beginGroup( QStringLiteral( "gui/locator_filters" ) );
-    const QStringList filters = settings.childGroups();
-    for ( const QString &filter : filters )
+    const QStringList childKeys = settings.childKeys();
+    for ( const QString &childKey : childKeys )
     {
-      QgsLocator::settingsLocatorFilterEnabled->copyValueFromKey( QStringLiteral( "gui/locator_filters/enabled_%1" ), {filter}, true );
-      QgsLocator::settingsLocatorFilterDefault->copyValueFromKey( QStringLiteral( "gui/locator_filters/default_%1" ), {filter}, true );
-      QgsLocator::settingsLocatorFilterPrefix->copyValueFromKey( QStringLiteral( "gui/locator_filters/prefix_%1" ), {filter}, true );
+      if ( childKey.startsWith( QStringLiteral( "enabled" ) ) )
+      {
+        QString filter = childKey;
+        filter.remove( QStringLiteral( "enabled_" ) );
+        QgsLocator::settingsLocatorFilterEnabled->copyValueFromKey( QStringLiteral( "gui/locator_filters/enabled_%1" ), {filter}, true );
+        QgsLocator::settingsLocatorFilterDefault->copyValueFromKey( QStringLiteral( "gui/locator_filters/default_%1" ), {filter}, true );
+        QgsLocator::settingsLocatorFilterPrefix->copyValueFromKey( QStringLiteral( "gui/locator_filters/prefix_%1" ), {filter}, true );
+      }
     }
   }