kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix meet me / local channel (bug #5274)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-09-25 03:57:53 +00:00
parent 96286be0ee
commit 446d1eee3e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -936,7 +936,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} }
ast_indicate(chan, -1); ast_indicate(chan, -1);
retryzap = strcasecmp(chan->type, "Zap"); retryzap = strcasecmp(chan->type, "Zap");
user->zapchannel = !strcasecmp(chan->type, "Zap"); user->zapchannel = !retryzap;
zapretry: zapretry:
origfd = chan->fds[0]; origfd = chan->fds[0];
if (retryzap) { if (retryzap) {
@@ -1228,10 +1228,11 @@ zapretry:
if (using_pseudo) { if (using_pseudo) {
/* Kill old pseudo */ /* Kill old pseudo */
close(fd); close(fd);
using_pseudo = 0;
} }
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n"); ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
retryzap = 0; retryzap = strcasecmp(c->type, "Zap");
using_pseudo = 0; user->zapchannel = !retryzap;
goto zapretry; goto zapretry;
} }
f = ast_read(c); f = ast_read(c);