aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-09 19:43:23 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-06-09 19:43:23 +0000
commita220a8ccbc17c0de3774764518d2ebabe2189747 (patch)
treebffd9ea1eab817a84989c82d6da1547d5983f190 /apps/app_meetme.c
parentb5f20fba170df243f736fb0cadb5027c51529ba4 (diff)
Minor meetme cleanups
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3182 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rwxr-xr-xapps/app_meetme.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 84f2e1081..271d4b5a7 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -763,12 +763,13 @@ zapretry:
if (c) {
if (c->fds[0] != origfd) {
- if (retryzap) {
+ if (using_pseudo) {
/* Kill old pseudo */
close(fd);
}
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
retryzap = 0;
+ using_pseudo = 0;
goto zapretry;
}
f = ast_read(c);
@@ -876,7 +877,7 @@ zapretry:
if (musiconhold) {
ast_moh_start(chan, NULL);
}
- } else if (fd != chan->fds[0]) {
+ } else if (using_pseudo) {
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) {
/* Carefully write */