From 2c897a8b8c7469e46a237a9ca16b813aefd85b09 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Tue, 11 Apr 2006 02:06:45 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19055 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- app.c | 6 ++---- apps/app_voicemail.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app.c b/app.c index b7bc31fe12..8041a8e731 100644 --- a/app.c +++ b/app.c @@ -551,7 +551,6 @@ int ast_play_and_record(struct ast_channel *chan, const char *playfile, const ch struct ast_dsp *sildet=NULL; /* silence detector dsp */ int totalsilence = 0; int dspsilence = 0; - int gotsilence = 0; /* did we timeout for silence? */ int rfmt=0; struct ast_silence_generator *silgen = NULL; @@ -674,7 +673,7 @@ int ast_play_and_record(struct ast_channel *chan, const char *playfile, const ch if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000); ast_frfree(f); - gotsilence = 1; + res = 'S'; outmsg=2; break; } @@ -778,7 +777,6 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf struct ast_dsp *sildet; /* silence detector dsp */ int totalsilence = 0; int dspsilence = 0; - int gotsilence = 0; /* did we timeout for silence? */ int rfmt=0; char prependfile[80]; @@ -897,7 +895,7 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000); ast_frfree(f); - gotsilence = 1; + res = 'S'; outmsg=2; break; } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e0fc6b8c4a..582595ad8f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3298,7 +3298,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, cmd = 't'; } } - if (cmd == 't') + if (cmd == 't' || cmd == 'S') cmd = 0; return cmd; }