From 02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 18 Jan 2017 15:28:04 -0500 Subject: Fix invalid cross-thread use of mutex Instead of abusing store mutex for this purpose, extend blocking mechanism of the PreProcessor (designed for atomic bundle execution) to support execution of individual atomic events which must be executed before the next event can be pre-processed. --- src/server/events/Delta.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/events/Delta.hpp') diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index ca9d0276..d2326cd9 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -78,6 +78,8 @@ public: void post_process(); void undo(Interface& target); + Execution get_execution() const; + private: enum class SpecialType { NONE, @@ -115,7 +117,7 @@ private: boost::optional _preset; - std::unique_lock _poly_lock; ///< Long-term lock for poly changes + bool _block; }; } // namespace Events -- cgit v1.2.1