Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-10-17 22:18:49 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix macro pause hotkeys not displaying macro name in OBS settings
Some checks are pending
debian-build / build (push) Waiting to run
Details
Push to master / Check Formatting 🔍 (push) Waiting to run
Details
Push to master / Build Project 🧱 (push) Waiting to run
Details
Push to master / Create Release 🛫 (push) Blocked by required conditions
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

10
lib/macro/macro-action-loop.cpp
View File

@@ -13,6 +13,12 @@ bool MacroActionLoop::_registered = MacroActionFactory::Register(
{MacroActionLoop::Create, MacroActionLoopEdit::Create,
"AdvSceneSwitcher.action.loop"});
MacroActionLoop::MacroActionLoop(Macro *m)
: MacroAction(m),
_loopMacro(Macro::CreateNested())
{
}
bool MacroActionLoop::PerformAction()
{
int iterations = 0;
@@ -71,7 +77,7 @@ bool MacroActionLoop::Load(obs_data_t *obj)
if (obs_data_has_user_value(obj, "loopMacro")) {
OBSDataAutoRelease loopMacroData =
obs_data_get_obj(obj, "loopMacro");
_loopMacro = std::make_shared<Macro>();
_loopMacro = Macro::CreateNested();
_loopMacro->Load(loopMacroData);
}
_customWidgetHeight = obs_data_get_int(obj, "customWidgetHeight");
@@ -99,7 +105,7 @@ std::shared_ptr<MacroAction> MacroActionLoop::Copy() const
OBSDataAutoRelease data = obs_data_create();
_loopMacro->Save(data);
copy->_loopMacro = std::make_shared<Macro>();
copy->_loopMacro = Macro::CreateNested();
copy->_loopMacro->Load(data);
copy->_loopMacro->PostLoad();