diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-03-25 20:30:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-03-25 20:30:26 +0000 |
| commit | ca1de500041e2739cf623bc94b090ff82ee6052c (patch) | |
| tree | 9879ef7815de3e47a993d9cb82986577d543d44f /libs/ardour/ardour/internal_return.h | |
| parent | e7d2509ad9a40a4f75856b620cd366df6e454216 (diff) | |
Give the _sends member of InternalReturn its own mutex,
rather than using the process lock to protect it. Prevents
a deadlock when removing an aux send causes it to remove
itself from its return (#4712).
git-svn-id: svn://localhost/ardour2/branches/3.0@11760 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/internal_return.h')
| -rw-r--r-- | libs/ardour/ardour/internal_return.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h index 1dff465cba..291b51896c 100644 --- a/libs/ardour/ardour/internal_return.h +++ b/libs/ardour/ardour/internal_return.h @@ -47,6 +47,8 @@ class InternalReturn : public Return private: /** sends that we are receiving data from */ std::list<InternalSend*> _sends; + /** mutex to protect _sends */ + Glib::Mutex _sends_mutex; }; } // namespace ARDOUR |