Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-12 04:11:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix race conditions when accessing variables

Browse Source
This commit is contained in:
WarmUpTill
2026-03-23 19:51:32 +01:00
committed by WarmUpTill
parent 85460157b1
commit 4d5ffe38fc
4 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/variables/variable-string.cpp
View File

@@ -9,11 +9,12 @@ void StringVariable::Resolve() const
_resolvedValue = _value;
return;
}
if (_lastResolve == GetLastVariableChangeTime()) {
const auto lastChange = GetLastVariableChangeTime();
if (_lastResolve == lastChange) {
return;
}
_resolvedValue = SubstitueVariables(_value);
_lastResolve = GetLastVariableChangeTime();
_lastResolve = lastChange;
}
StringVariable::operator std::string() const
@@ -81,7 +82,7 @@ std::string SubstitueVariables(std::string str)
const auto &variable = std::dynamic_pointer_cast<Variable>(v);
const std::string pattern = "${" + variable->Name() + "}";
if (ReplaceAll(str, pattern, variable->Value(false))) {
variable->UpdateLastUsed();
variable->MarkAsUsed();
}
}
return str;