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

Fix macro count not updating correctly

Browse Source 
The underlying issue are the potential deadlocks when triggering
frontent function calls while saving / loading is triggered in parallel
like it can happen when switching scene collections.

Hopefully the new frontend events allow for a cleaner solution.
This commit is contained in:
WarmUpTill 2021-11-11 21:59:14 +01:00 committed by WarmUpTill
parent 5ef09f661f
commit fbc9818764
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/macro.cpp
View File

@ -93,6 +93,14 @@ bool Macro::CeckMatch()
}
vblog(LOG_INFO, "Macro %s returned %d", _name.c_str(), _matched);
// TODO: Move back to PerformAction() once new scene collection frontend
// events are available - see:
// https://github.com/obsproject/obs-studio/commit/feda1aaa283e8a99f6ba1159cfe6b9c1f2934a61
if (_matched && _count != std::numeric_limits<int>::max()) {
_count++;
}
return _matched;
}
@ -106,9 +114,6 @@ bool Macro::PerformAction()
return false;
}
}
if (_count != std::numeric_limits<int>::max()) {
_count++;
}
return ret;
}
@ -500,6 +505,9 @@ bool SwitcherData::checkMacros()
bool SwitcherData::runMacros()
{
// TODO: Don't rely on creating a copy of each macro once new frontend
// events are available - see:
// https://github.com/obsproject/obs-studio/commit/feda1aaa283e8a99f6ba1159cfe6b9c1f2934a61
for (auto m : macros) {
if (m.Matched()) {
vblog(LOG_INFO, "running macro: %s", m.Name().c_str());