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

Copy logic type when adding conditions

Browse Source
This commit is contained in:
WarmUpTill 2022-02-17 20:45:58 +01:00 committed by WarmUpTill
parent bdd489aea5
commit 584fe4b3b6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/macro-condition-edit.cpp
View File

@ -264,14 +264,20 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
}
std::string id;
if (idx - 1 >= 0) {
LogicType logic;
if (idx >= 1) {
id = macro->Conditions().at(idx - 1)->GetId();
if (idx == 1) {
logic = LogicType::NONE;
} else {
logic = macro->Conditions().at(idx - 1)->GetLogicType();
}
} else {
MacroConditionScene temp(macro);
id = temp.GetId();
logic = LogicType::ROOT_NONE;
}
std::lock_guard<std::mutex> lock(switcher->m);
bool root = idx == 0;
auto cond = macro->Conditions().emplace(
macro->Conditions().begin() + idx,
MacroConditionFactory::Create(id, macro));
@ -281,7 +287,6 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
macro->Conditions().at(idx)->Load(data);
obs_data_release(data);
}
auto logic = root ? LogicType::ROOT_NONE : LogicType::NONE;
(*cond)->SetLogicType(logic);
macro->UpdateConditionIndices();