diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-05 15:25:08 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-05 15:25:08 +0000 |
| commit | 6a621b4cc71ab3d3efd71b9a519fa139088d31a4 (patch) | |
| tree | 522ce9b51d323be57772337949f840e41ba5e7d6 /apps | |
| parent | b3bdd177ef7c3f873c0311a4c97d24ff51e7673c (diff) | |
Fix meetme flushing stupidity (doh!) (bug #3599)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5148 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_meetme.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 269e6c5ea..ff70b5e65 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -540,10 +540,8 @@ static void conf_flush(int fd) { int x; x = ZT_FLUSH_ALL; - if (ioctl(fd, ZT_FLUSH, x)) { + if (ioctl(fd, ZT_FLUSH, &x)) ast_log(LOG_WARNING, "Error flushing channel\n"); - close(fd); - } } static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags) @@ -795,7 +793,6 @@ zapretry: ast_mutex_unlock(&conflock); goto outrun; } - conf_flush(fd); ast_log(LOG_DEBUG, "Placed channel %s in ZAP conf %d\n", chan->name, conf->zapconf); manager_event(EVENT_FLAG_CALL, "MeetmeJoin", @@ -810,6 +807,7 @@ zapretry: if (!(confflags & CONFFLAG_QUIET)) conf_play(chan, conf, ENTER); } + conf_flush(fd); ast_mutex_unlock(&conflock); if (confflags & CONFFLAG_AGI) { |