Merged revisions 214940 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 31 Aug 2009 16:18:33 +0000 (16:18 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 31 Aug 2009 16:18:33 +0000 (16:18 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r214940 | tilghman | 2009-08-31 11:16:52 -0500 (Mon, 31 Aug 2009) | 7 lines

  Also unlock the "other" channel, when returning, due to glare.
  (closes issue #15787)
   Reported by: tim_ringenbach
   Patches:
         chan_local.diff uploaded by tim ringenbach (license 540)
   Tested by: tim_ringenbach
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@214945 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_local.c

index df1a2c4..4d609af 100644 (file)
@@ -236,6 +236,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
                return and destroy p.  */
                ast_mutex_unlock(&p->lock);
                p = local_pvt_destroy(p);
+               if (other) {
+                       ast_channel_unlock(other);
+               }
                return -1;
        }