From 1bc9545d2ee6d22f4eefae00231d57ab85b8bccc Mon Sep 17 00:00:00 2001
From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Mon, 25 Apr 2011 07:11:12 +0000
Subject: [PATCH] Merged revisions 315051 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r315051 | alecdavis | 2011-04-25 19:06:29 +1200 (Mon, 25 Apr 2011) | 11 lines

  chan_local:check_bridge() misplaced misplaced ast_mutex_unlock

  if !p->chan->_bridge->_softhangup path isn't followed, brigde remains locked.

  (closes issue #19176)
  Reported by: alecdavis
  Patches:
        bug19176.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@315052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_local.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 6f7d232750..8d13f28a74 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -468,8 +468,8 @@ static void check_bridge(struct local_pvt *p)
 					}
 					ast_channel_unlock(p->owner);
 				}
-				ast_channel_unlock(p->chan->_bridge);
 			}
+			ast_channel_unlock(p->chan->_bridge);
 		}
 	}
 }