JSON wizards: Don't add paths from environment over and over

It would add the paths from the environment variable again, each time the searchPaths are requested Change-Id: I2650ba832e23b5fcd6bfd363389e1eaf3beddb9d Reviewed-by: Christian Stenger <[email protected]> Reviewed-by: <[email protected]>
zatochi · Nov 18, 2022 · f5efd9a · f5efd9a
1 parent c18d877
commit f5efd9a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -505,10 +505,15 @@ static QStringList environmentTemplatesPaths()
 
 FilePaths &JsonWizardFactory::searchPaths()
 {
-    static FilePaths m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH),
-                                      Core::ICore::resourcePath(WIZARD_PATH)};
-    for (const QString &environmentTemplateDirName : environmentTemplatesPaths())
-        m_searchPaths << FilePath::fromString(environmentTemplateDirName);
+    static FilePaths m_searchPaths;
+    static bool searchPathsInitialized = false;
+    if (!searchPathsInitialized) {
+        searchPathsInitialized = true;
+        m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH),
+                         Core::ICore::resourcePath(WIZARD_PATH)};
+        for (const QString &environmentTemplateDirName : environmentTemplatesPaths())
+            m_searchPaths << FilePath::fromString(environmentTemplateDirName);
+    }
 
     return m_searchPaths;
 }