Skip to content
Snippets Groups Projects
Commit 6da47b2f authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Another attempt at python fix

parent 5848bdd9
No related branches found
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #28537 failed
...@@ -277,7 +277,6 @@ static void _indexConfig(json_t &cfg) { ...@@ -277,7 +277,6 @@ static void _indexConfig(json_t &cfg) {
ftl::Configurable *ftl::config::find(const std::string &uri) { ftl::Configurable *ftl::config::find(const std::string &uri) {
if (uri.size() == 0) return nullptr; if (uri.size() == 0) return nullptr;
std::string actual_uri = uri; std::string actual_uri = uri;
if (uri[0] == '/') { if (uri[0] == '/') {
if (uri.size() == 1) { if (uri.size() == 1) {
...@@ -878,16 +877,13 @@ Configurable *ftl::config::configure(int argc, char **argv, const std::string &r ...@@ -878,16 +877,13 @@ Configurable *ftl::config::configure(int argc, char **argv, const std::string &r
string root_str = (options.find("root") != options.end()) ? nlohmann::json::parse(options["root"]).get<string>() : root; string root_str = (options.find("root") != options.end()) ? nlohmann::json::parse(options["root"]).get<string>() : root;
cfg_root_str = root_str; cfg_root_str = root_str;
if (!config.contains("$id")) {
config["$id"] = "ftl://utu.fi";
}
if (options.find("id") != options.end()) config["$id"] = nlohmann::json::parse(options["id"]).get<string>(); if (options.find("id") != options.end()) config["$id"] = nlohmann::json::parse(options["id"]).get<string>();
_indexConfig(config); _indexConfig(config);
config_restore = std::move(ftl::loadJSON(std::string(FTL_LOCAL_CONFIG_ROOT "/")+cfg_root_str+std::string("_session.json"))); config_restore = std::move(ftl::loadJSON(std::string(FTL_LOCAL_CONFIG_ROOT "/")+cfg_root_str+std::string("_session.json")));
Configurable *rootcfg = nullptr; Configurable *rootcfg = nullptr;
rootCFG = rootcfg;
try { try {
rootcfg = create<Configurable>(config); rootcfg = create<Configurable>(config);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment