diff options
author | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-06 17:31:04 +0000 |
---|---|---|
committer | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-06 17:31:04 +0000 |
commit | 9e0406854d9b80a54e2feafc65646027c26e9498 (patch) | |
tree | f5f69347638430e45ee640e5eece5366f9b2d13b /channels | |
parent | bb322ade2aab1d0b4c0263af067b9c780c3d2539 (diff) |
re-do the monitor fix (check for io before killing ourself)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1892 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-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); |