Index: apps/app_meetme.c =================================================================== --- apps/app_meetme.c (revision 121854) +++ apps/app_meetme.c (working copy) @@ -1909,6 +1909,8 @@ break; if (c) { + char dtmfstr[2] = ""; + if (c->fds[0] != origfd || (user->zapchannel && (c->audiohooks || c->monitor))) { if (using_pseudo) { /* Kill old pseudo */ @@ -1926,6 +1928,11 @@ f = ast_read(c); if (!f) break; + if (f->frametype == AST_FRAME_DTMF) { + dtmfstr[0] = f->subclass; + dtmfstr[1] = '\0'; + } + if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) { if (user->talk.actual) ast_frame_adjust_volume(f, user->talk.actual); @@ -1976,21 +1983,6 @@ if (user->talking || !(confflags & CONFFLAG_OPTIMIZETALKER)) careful_write(fd, f->data, f->datalen, 0); } - } else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) { - char tmp[2]; - - if (confflags & CONFFLAG_PASS_DTMF) - conf_queue_dtmf(conf, user, f); - - tmp[0] = f->subclass; - tmp[1] = '\0'; - if (!ast_goto_if_exists(chan, exitcontext, tmp, 1)) { - ast_log(LOG_DEBUG, "Got DTMF %c, goto context %s\n", tmp[0], exitcontext); - ret = 0; - ast_frfree(f); - break; - } else if (option_debug > 1) - ast_log(LOG_DEBUG, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext); } else if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#') && (confflags & CONFFLAG_POUNDEXIT)) { if (confflags & CONFFLAG_PASS_DTMF) conf_queue_dtmf(conf, user, f); @@ -2154,6 +2146,18 @@ } conf_flush(fd, chan); + /* Since this option could absorb dtmf for the previous, we have to check this one last */ + } else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT) && ast_exists_extension(chan, exitcontext, dtmfstr, 1, "")) { + if (confflags & CONFFLAG_PASS_DTMF) + conf_queue_dtmf(conf, user, f); + + if (!ast_goto_if_exists(chan, exitcontext, dtmfstr, 1)) { + ast_log(LOG_DEBUG, "Got DTMF %c, goto context %s\n", dtmfstr[0], exitcontext); + ret = 0; + ast_frfree(f); + break; + } else if (option_debug > 1) + ast_log(LOG_DEBUG, "Exit by single digit did not work in meetme. Extension '%s' does not exist in context '%s'\n", dtmfstr, exitcontext); } else if ((f->frametype == AST_FRAME_DTMF_BEGIN || f->frametype == AST_FRAME_DTMF_END) && confflags & CONFFLAG_PASS_DTMF) { conf_queue_dtmf(conf, user, f);