aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-28 09:39:16 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-28 09:39:16 +0000
commit8cc315343f36a267b44b17e452d6f10485e57057 (patch)
tree0aa2b469879cfdcdc0adf53699ce1b6fc8c3dd63 /main
parente8f45989fea9337d6ba8762fe3700e9246cc1cc0 (diff)
another normalization of AMI vs HTTP identification.
Should really define a macro IS_AMI(s) so it is clear what we want to do. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48078 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c
index 4b0f87e45..5a852bfbe 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1149,7 +1149,7 @@ static int action_waitevent(struct mansession *s, struct message *m)
ast_mutex_unlock(&s->__lock);
if (needexit)
break;
- if (!s->inuse && s->fd > 0) { /* AMI session */
+ if (s->managerid == 0) { /* AMI session */
if (ast_wait_for_input(s->fd, 1000))
break;
} else { /* HTTP session */