Fix handling of searchPathsForPlugins in qgisapp

agiudiceandrea · nyalldawson · commit 94a3ac37a089 · 2023-03-02T08:16:07.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1604,10 +1604,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers
     QgsPluginRegistry::instance()->restoreSessionPlugins( QgsApplication::pluginPath() );
 
     // Also restore plugins from user specified plugin directories
-    QString myPaths = settings.value( QStringLiteral( "plugins/searchPathsForPlugins" ), "" ).toString();
-    if ( !myPaths.isEmpty() )
+    QStringList myPathList = settings.value( QStringLiteral( "plugins/searchPathsForPlugins" ) ).toStringList();
+    if ( !myPathList.isEmpty() )
     {
-      QStringList myPathList = myPaths.split( '|' );
+      myPathList.removeDuplicates();
       QgsPluginRegistry::instance()->restoreSessionPlugins( myPathList );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1604,10 +1604,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers`
`1604`	`1604`	`QgsPluginRegistry::instance()->restoreSessionPlugins( QgsApplication::pluginPath() );`
`1605`	`1605`
`1606`	`1606`	`// Also restore plugins from user specified plugin directories`
`1607`		`- QString myPaths = settings.value( QStringLiteral( "plugins/searchPathsForPlugins" ), "" ).toString();`
`1608`		`- if ( !myPaths.isEmpty() )`
	`1607`	`+ QStringList myPathList = settings.value( QStringLiteral( "plugins/searchPathsForPlugins" ) ).toStringList();`
	`1608`	`+ if ( !myPathList.isEmpty() )`
`1609`	`1609`	`{`
`1610`		`- QStringList myPathList = myPaths.split( '\|' );`
	`1610`	`+ myPathList.removeDuplicates();`
`1611`	`1611`	`QgsPluginRegistry::instance()->restoreSessionPlugins( myPathList );`
`1612`	`1612`	`}`
`1613`	`1613`	`}`