diff --git a/src/headers/switch-sequence.hpp b/src/headers/switch-sequence.hpp index ca430ede..846402e4 100644 --- a/src/headers/switch-sequence.hpp +++ b/src/headers/switch-sequence.hpp @@ -31,8 +31,7 @@ struct SceneSequenceSwitch : SceneSwitcherEntry { bool checkMatch(OBSWeakSource currentScene, int &linger, SceneSequenceSwitch *root = nullptr); bool checkDurationMatchInterruptible(); - void prepareUninterruptibleMatch(OBSWeakSource currentScene, - int &linger); + void prepareUninterruptibleMatch(int &linger); void advanceActiveSequence(); void logAdvanceSequence(); void logSequenceCanceled(); diff --git a/src/macro-action-plugin-state.cpp b/src/macro-action-plugin-state.cpp index 4f368862..c2c011a5 100644 --- a/src/macro-action-plugin-state.cpp +++ b/src/macro-action-plugin-state.cpp @@ -39,7 +39,7 @@ void MacroActionPluginState::LogAction() auto it = actionTypes.find(_action); switch (_action) { case PluginStateAction::STOP: - blog(LOG_INFO, "stop() called by macro", it->second.c_str()); + blog(LOG_INFO, "stop() called by macro"); break; default: blog(LOG_WARNING, "ignored unknown pluginState action %d", diff --git a/src/switch-sequence.cpp b/src/switch-sequence.cpp index a9889845..09e2f5af 100644 --- a/src/switch-sequence.cpp +++ b/src/switch-sequence.cpp @@ -415,7 +415,7 @@ bool SceneSequenceSwitch::checkMatch(OBSWeakSource currentScene, int &linger, match = checkDurationMatchInterruptible(); } else { match = true; - prepareUninterruptibleMatch(currentScene, linger); + prepareUninterruptibleMatch(linger); } } else { delay.Reset(); @@ -438,8 +438,7 @@ bool SceneSequenceSwitch::checkDurationMatchInterruptible() return false; } -void SceneSequenceSwitch::prepareUninterruptibleMatch( - OBSWeakSource currentScene, int &linger) +void SceneSequenceSwitch::prepareUninterruptibleMatch(int &linger) { int dur = delay.seconds * 1000; if (dur > 0) {