From: Anthony Minessale Date: Thu, 3 Apr 2008 20:08:39 +0000 (+0000) Subject: update X-Git-Tag: v1.0-rc3~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acd607f8cea33bb094b3648d135e56d2bf1236f6;p=thirdparty%2Ffreeswitch.git update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8010 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index 974e9e4f90..01655bcd6b 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.c +++ b/src/mod/applications/mod_fifo/mod_fifo.c @@ -232,15 +232,6 @@ SWITCH_STANDARD_APP(fifo_function) moh = switch_channel_get_variable(channel, "fifo_music"); announce = switch_channel_get_variable(channel, "fifo_announce"); - if (argc > 2) { - if (!strcasecmp(argv[2], "nowait")) { - nowait++; - } else if (strcasecmp(argv[2], "wait")) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); - return; - } - } - if (!strcasecmp(argv[1], "in")) { const char *uuid = strdup(switch_core_session_get_uuid(session)); const char *pri; @@ -346,6 +337,16 @@ SWITCH_STANDARD_APP(fifo_function) const char *fifo_consumer_wrapup_key = NULL; char buf[5] = ""; + + if (argc > 2) { + if (!strcasecmp(argv[2], "nowait")) { + nowait++; + } else if (strcasecmp(argv[2], "wait")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); + return; + } + } + if (argc > 3) { announce = argv[3]; }