Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-10-20 23:53:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macro pause hotkeys not displaying macro name in OBS settings
Some checks failed
debian-build / build (push) Has been cancelled
Details
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
WarmUpTill
2026-10-15 19:01:25 +02:00
committed by WarmUpTill
parent 62d443819e
commit ccaadb0ffd
7 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/macro/macro-action-macro.cpp
View File

@@ -18,6 +18,13 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
{MacroActionMacro::Create, MacroActionMacroEdit::Create,
"AdvSceneSwitcher.action.macro"});
MacroActionMacro::MacroActionMacro(Macro *m)
: MacroAction(m),
MacroRefAction(m),
_nestedMacro(Macro::CreateNested())
{
}
void MacroActionMacro::AdjustActionState(Macro *macro) const
{
const auto &macroActions = _useElseSection ? macro->ElseActions()
@@ -266,7 +273,7 @@ bool MacroActionMacro::Load(obs_data_t *obj)
if (obs_data_has_user_value(obj, "nestedMacro")) {
OBSDataAutoRelease nestedMacroData =
obs_data_get_obj(obj, "nestedMacro");
_nestedMacro = std::make_shared<Macro>();
_nestedMacro = Macro::CreateNested();
_nestedMacro->Load(nestedMacroData);
}
@@ -303,7 +310,7 @@ std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
OBSDataAutoRelease data = obs_data_create();
_nestedMacro->Save(data);
copy->_nestedMacro = std::make_shared<Macro>();
copy->_nestedMacro = Macro::CreateNested();
copy->_nestedMacro->Load(data);
copy->_nestedMacro->PostLoad();