diff options
| author | David Robillard <d@drobilla.net> | 2011-09-24 04:52:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-24 04:52:23 +0000 |
| commit | 9085d33b7600fd2721f0a2401a4e69830c457f84 (patch) | |
| tree | 17631e4c88c8fd9d61045e23e84de5f19c005b7b /src/server/events/DisconnectAll.cpp | |
| parent | 0e310888809be1b55e6c24081f41f56bebf00f58 (diff) | |
| download | ingen-9085d33b7600fd2721f0a2401a4e69830c457f84.tar.gz ingen-9085d33b7600fd2721f0a2401a4e69830c457f84.tar.bz2 ingen-9085d33b7600fd2721f0a2401a4e69830c457f84.zip | |
Remove concept of "blocking" events in favour of store RWLock.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3488 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/DisconnectAll.cpp')
| -rw-r--r-- | src/server/events/DisconnectAll.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 23db5167..f355575a 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -16,6 +16,7 @@ */ #include <boost/format.hpp> +#include <glibmm/thread.h> #include "raul/Array.hpp" #include "raul/Maid.hpp" @@ -98,7 +99,11 @@ DisconnectAll::maybe_remove_connection(ConnectionImpl* c) void DisconnectAll::pre_process() { + Glib::RWLock::WriterLock lock(_engine.engine_store()->lock(), Glib::NOT_LOCK); + if (!_deleting) { + lock.acquire(); + _parent = _engine.engine_store()->find_patch(_parent_path); if (_parent == NULL) { @@ -115,7 +120,8 @@ DisconnectAll::pre_process() return; } - if (object->parent_patch() != _parent && object->parent()->parent_patch() != _parent) { + if (object->parent_patch() != _parent + && object->parent()->parent_patch() != _parent) { _error = INVALID_PARENT_PATH; QueuedEvent::pre_process(); return; |