Fix temp var references not being resolved on macro copy and import

WarmUpTill · Feb 17, 2024 · aa1b104 · aa1b104
1 parent 6cbfc48
commit aa1b104
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/lib/general.cpp b/lib/general.cpp
@@ -561,9 +561,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
 
-	for (const auto &func : postLoadSteps) {
-		func();
-	}
+	RunPostLoadSteps();
 
 	// Reset on startup and scene collection change
 	switcher->lastOpenedTab = -1;

diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp
@@ -449,6 +449,7 @@ void AdvSceneSwitcher::ImportMacros()
 	for (const auto &macro : importedMacros) {
 		macro->PostLoad();
 	}
+	RunPostLoadSteps();
 
 	ui->macros->Reset(GetMacros(),
 			  GetGlobalMacroProperties()._highlightExecuted);
@@ -995,6 +996,7 @@ void AdvSceneSwitcher::CopyMacro()
 	newMacro->Load(data);
 	newMacro->PostLoad();
 	newMacro->SetName(name);
+	RunPostLoadSteps();
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);

diff --git a/lib/switcher-data.cpp b/lib/switcher-data.cpp
@@ -179,6 +179,14 @@ void SwitcherData::AddIntervalResetStep(std::function<void()> function,
 	resetIntervalSteps.emplace_back(function);
 }
 
+void SwitcherData::RunPostLoadSteps()
+{
+	for (const auto &func : postLoadSteps) {
+		func();
+	}
+	postLoadSteps.clear();
+}
+
 void SwitcherData::AddPluginInitStep(std::function<void()> function)
 {
 	std::lock_guard<std::mutex> lock(switcher->m);

diff --git a/lib/switcher-data.hpp b/lib/switcher-data.hpp
@@ -65,6 +65,7 @@ class SwitcherData {
 	void AddLoadStep(std::function<void(obs_data_t *)>);
 	void AddPostLoadStep(std::function<void()>);
 	void AddIntervalResetStep(std::function<void()>, bool lock = true);
+	void RunPostLoadSteps();
 	void AddPluginInitStep(std::function<void()>);
 	void AddPluginPostLoadStep(std::function<void()>);
 	void AddPluginCleanupStep(std::function<void()>);

diff --git a/lib/utils/plugin-state-helpers.cpp b/lib/utils/plugin-state-helpers.cpp
@@ -28,6 +28,11 @@ void AddIntervalResetStep(std::function<void()> step, bool lock)
 	GetSwitcher()->AddIntervalResetStep(step, lock);
 }
 
+void RunPostLoadSteps()
+{
+	GetSwitcher()->RunPostLoadSteps();
+}
+
 void AddPluginInitStep(std::function<void()> step)
 {
 	GetSwitcher()->AddPluginInitStep(step);

diff --git a/lib/utils/plugin-state-helpers.hpp b/lib/utils/plugin-state-helpers.hpp
@@ -11,6 +11,7 @@ EXPORT void AddSaveStep(std::function<void(obs_data_t *)>);
 EXPORT void AddLoadStep(std::function<void(obs_data_t *)>);
 EXPORT void AddPostLoadStep(std::function<void()>);
 EXPORT void AddIntervalResetStep(std::function<void()>, bool lock = true);
+EXPORT void RunPostLoadSteps();
 
 EXPORT void AddPluginInitStep(std::function<void()>);
 EXPORT void AddPluginPostLoadStep(std::function<void()>);