mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 19:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try a fix against random crashes at startup when loading configuration

Browse Source
This commit is contained in:
Alexander Bock
2021-02-01 13:31:28 +01:00
parent c323a05021
commit e50ca7aded
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: e42b3f58c4...1750e592bb

11
src/engine/configuration.cpp
View File

@@ -147,7 +147,7 @@ namespace {
for (size_t i = 1; i <= d.size(); ++i) {
res.push_back(d.value<std::string>(std::to_string(i)));
}
value = res;
value = std::move(res);
}
// NOLINTNEXTLINE
else if constexpr (std::is_same_v<T, std::map<std::string, std::string>>) {
@@ -160,7 +160,7 @@ namespace {
std::string v = d.value<std::string>(key);
res[std::string(key)] = std::move(v);
}
value = res;
value = std::move(res);
}
// NOLINTNEXTLINE
else if constexpr (std::is_same_v<T, std::map<std::string, ghoul::Dictionary>>) {
@@ -173,7 +173,7 @@ namespace {
ghoul::Dictionary v = d.value<ghoul::Dictionary>(key);
res[std::string(key)] = std::move(v);
}
value = res;
value = std::move(res);
}
// NOLINTNEXTLINE
else if constexpr (std::is_same_v<T, Configuration::Logging>) {
@@ -256,7 +256,10 @@ namespace {
filter.type = fi.value<std::string>(KeyType);
}
res.push_back(filter);
auto fff = filter;
const auto ffg = filter;
res.push_back(std::move(filter));
}
v.identifierFilters = res;