Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-09 18:55:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix temp var values of actions not being accessible

Browse Source 
This a bug introduced with ec3052c823.
This commit is contained in:
WarmUpTill 2026-04-03 13:21:25 +02:00 committed by WarmUpTill
parent b02259e926
commit df42538319
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/macro/macro-segment.cpp
View File

@ -167,6 +167,24 @@ bool MacroSegment::IsTempVarInUse(const std::string &id) const
return false;
}
void MacroSegment::CopyTempVarValuesFrom(const MacroSegment &other)
{
for (const auto &src : other._tempVariables) {
for (auto &dst : _tempVariables) {
if (dst.ID() != src.ID()) {
continue;
}
auto value = src.Value();
if (value) {
dst.SetValue(*value);
} else {
dst.InvalidateValue();
}
break;
}
}
}
void MacroSegment::SetTempVarValue(const std::string &id,
const std::string &value)
{

1
lib/macro/macro-segment.hpp
View File

@ -57,6 +57,7 @@ protected:
bool IsTempVarInUse(const std::string &id) const;
void SetTempVarValue(const std::string &id, const std::string &value);
void CopyTempVarValuesFrom(const MacroSegment &other);
template<typename T, typename = std::enable_if_t<
std::is_same<std::decay_t<T>, bool>::value>>

3
lib/macro/macro.cpp
View File

@ -433,6 +433,9 @@ bool Macro::RunActionsHelper(
actionCopy = action->Copy();
});
bool actionResult = actionCopy->PerformAction();
action->WithLock([&action, &actionCopy]() {
action->CopyTempVarValuesFrom(*actionCopy);
});
actionsExecutedSuccessfully =
actionsExecutedSuccessfully && actionResult;
} else {