From 9697652c0ae6768b6a8c0abb6c1ee3902d199de7 Mon Sep 17 00:00:00 2001 From: Jeremy McNamara <jj@nufone.net> Date: Tue, 6 Jan 2004 17:31:04 +0000 Subject: [PATCH] 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 --- channels/chan_h323.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_h323.c b/channels/chan_h323.c index d2cc44e58f..f0261c9ca9 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); -- GitLab