From d594470148c5ac722937aa4765a15f92082c4b86 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 6 Aug 2007 04:45:24 +0000 Subject: [PATCH] Fix for deadlock in Session::remove_source that was committed in rev 1815 git-svn-id: svn://localhost/ardour2/trunk@2253 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 0d81384637..3a7e5aeaa8 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2714,14 +2714,10 @@ Session::remove_source (boost::weak_ptr src) { Glib::Mutex::Lock lm (source_lock); - - { - Glib::Mutex::Lock lm (source_lock); - - if ((i = sources.find (source->id())) != sources.end()) { - sources.erase (i); - } - } + + if ((i = sources.find (source->id())) != sources.end()) { + sources.erase (i); + } } if (!_state_of_the_state & InCleanup) {