hard path not to config

Signed-off-by: Martin Ribelotta <[email protected]>
martinribelotta · Jul 30, 2017 · 0e90c49 · 0e90c49
1 parent d6fb2cb
commit 0e90c49
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 8 deletions.
diff --git a/images/document-close.svg b/images/document-close.svg
diff --git a/main.cpp b/main.cpp
@@ -59,20 +59,22 @@ int main(int argc, char *argv[])
              << tr.load(QLocale::system().name(), ":/i18n");
     a.installTranslator(&tr);
 
+    AppConfig::mutableInstance().load();
+    AppConfig::mutableInstance().adjustPath();
     QFile hardConfFile(QDir(QApplication::applicationDirPath()).absoluteFilePath(HARD_CONF_PATH));
     if (hardConfFile.open(QFile::ReadOnly)) {
         AppConfig::mutableInstance().load();
         auto hardConf = QJsonDocument::fromJson(hardConfFile.readAll()).object();
         QStringList additionalPaths;
         for (auto p: hardConf.value("additionalPaths").toArray())
-            additionalPaths.append(AppConfig::mutableInstance().filterTextWithVariables(p.toString()));
-        AppConfig::mutableInstance().setBuildAdditionalPaths(additionalPaths);
+            additionalPaths.append(QDir::cleanPath(AppConfig::mutableInstance()
+                                        .filterTextWithVariables(p.toString())));
+        AppConfig::mutableInstance().adjustPath(additionalPaths);
         AppConfig::mutableInstance().setBuildTemplateUrl(hardConf.value("templateUrl").toString());
         AppConfig::mutableInstance().save();
     }
 
     AppConfig::mutableInstance().load();
-    AppConfig::mutableInstance().adjustPath();
 
     QDir projectDir = AppConfig::mutableInstance().buildDefaultProjectPath();
     QDir wSpace(QDir::cleanPath(projectDir.absoluteFilePath("..")));