diff options
author | Jeremy McNamara <jj@nufone.net> | 2004-01-06 17:31:04 +0000 |
---|---|---|
committer | Jeremy McNamara <jj@nufone.net> | 2004-01-06 17:31:04 +0000 |
commit | 9697652c0ae6768b6a8c0abb6c1ee3902d199de7 (patch) | |
tree | f5f69347638430e45ee640e5eece5366f9b2d13b | |
parent | c3b8ab76a500b4915a68271f8a223dba1470c1de (diff) |
re-do the monitor fix (check for io before killing ourself)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | channels/chan_h323.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index d2cc44e58..f0261c9ca 100755 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -1238,13 +1238,14 @@ restartsearch: } ast_mutex_unlock(&iflock); - pthread_testcancel(); - /* Wait for sched or io */ res = ast_sched_wait(sched); if ((res < 0) || (res > 1000)) res = 1000; res = ast_io_wait(io, res); + + pthread_testcancel(); + ast_mutex_lock(&monlock); if (res >= 0) ast_sched_runq(sched); |