diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 17:25:34 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 17:25:34 +0000 |
| commit | 471fffd6d0704f75b537867700e48447aba62358 (patch) | |
| tree | d527dcb40de8ad4705b13f1a0a622bb3118f3101 /channels | |
| parent | e574af79b3102f63cb5d0735362c2a1ab1ccb08e (diff) | |
Merged revisions 139469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r139469 | mmichelson | 2008-08-22 12:25:12 -0500 (Fri, 22 Aug 2008) | 11 lines
Merged revisions 139466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines
Fix the build. Thanks, mvanbaak!
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139471 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 8939fc344..16bd75d71 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8695,13 +8695,13 @@ retryowner: pbx_builtin_setvar_helper(bridged_chan, "BLINDTRANSFER", iaxs[fr->callno]->owner->name); if (!strcmp(ies.called_number, ast_parking_ext())) { struct ast_channel *saved_channel = iaxs[fr->callno]->owner; - ast_mutex_unlock(iaxsl[fr->callno]); + ast_mutex_unlock(&iaxsl[fr->callno]); if (iax_park(bridged_chan, saved_channel)) { ast_log(LOG_WARNING, "Failed to park call on '%s'\n", bridged_chan->name); } else { ast_debug(1, "Parked call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name); } - ast_mutex_lock(iaxsl[fr->callno]); + ast_mutex_lock(&iaxsl[fr->callno]); } else { if (ast_async_goto(bridged_chan, iaxs[fr->callno]->context, ies.called_number, 1)) ast_log(LOG_WARNING, "Async goto of '%s' to '%s@%s' failed\n", bridged_chan->name, |