Use proper capturing technique.

Themaister · Nov 19, 2023 · a7ebfc6 · a7ebfc6
1 parent 95de1ab
commit a7ebfc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/application/events/application_wsi.cpp b/application/events/application_wsi.cpp
@@ -98,15 +98,15 @@ void GraniteWSIPlatform::dispatch_template_filter(const T &t)
 }
 
 template <typename Func>
-void GraniteWSIPlatform::dispatch_or_defer(const Func &func)
+void GraniteWSIPlatform::dispatch_or_defer(Func &&func)
 {
 	if (in_async_input)
-		captured.emplace_back(std::move(func));
+		captured.emplace_back(std::forward<Func>(func));
 	else
 		func();
 }
 
-#define WORK(work) dispatch_or_defer([this, &e]() { work; })
+#define WORK(work) dispatch_or_defer([this, e]() { work; })
 
 void GraniteWSIPlatform::dispatch(const TouchDownEvent &e)
 {
@@ -180,6 +180,7 @@ void GraniteWSIPlatform::end_async_input_handling()
 
 void GraniteWSIPlatform::flush_deferred_input_events()
 {
+	VK_ASSERT(!in_async_input);
 	for (auto &func : captured)
 		func();
 	captured.clear();

diff --git a/application/events/application_wsi.hpp b/application/events/application_wsi.hpp
@@ -73,7 +73,7 @@ class GraniteWSIPlatform : public Vulkan::WSIPlatform, private InputTrackerHandl
 	template <typename T>
 	void dispatch_template(const T &t);
 	template <typename Func>
-	void dispatch_or_defer(const Func &func);
+	void dispatch_or_defer(Func &&func);
 
 	bool in_async_input = false;
 	std::vector<std::function<void ()>> captured;