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

Fix macro references not being resolved when importing macros

Browse Source
This commit is contained in:
WarmUpTill
2023-12-03 21:10:08 +01:00
committed by WarmUpTill
parent 7d1253e14e
commit 7914f75876
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/macro-core/macro-tab.cpp
View File

@@ -413,13 +413,13 @@ void AdvSceneSwitcher::ImportMacros()
int groupSize = 0;
std::shared_ptr<Macro> group;
std::vector<std::shared_ptr<Macro>> importedMacros;
auto lock = LockContext();
for (size_t i = 0; i < count; i++) {
OBSDataAutoRelease array_obj = obs_data_array_item(array, i);
auto macro = std::make_shared<Macro>();
macro->Load(array_obj);
macro->PostLoad();
if (macroNameExists(macro->Name()) &&
!ResolveMacroImportNameConflict(macro)) {
@@ -427,6 +427,7 @@ void AdvSceneSwitcher::ImportMacros()
continue;
}
importedMacros.emplace_back(macro);
switcher->macros.emplace_back(macro);
if (groupSize > 0 && !macro->IsGroup()) {
Macro::PrepareMoveToGroup(group, macro);
@@ -443,6 +444,10 @@ void AdvSceneSwitcher::ImportMacros()
}
}
for (const auto &macro : importedMacros) {
macro->PostLoad();
}
ui->macros->Reset(switcher->macros,
switcher->macroProperties._highlightExecuted);
}