automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19055 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/app.c b/app.c
index b7bc31fe12a9ad84e586e2ac4918891fac476491..8041a8e7316ed5025cbc0f50e72c4a4ffa3abcbe 100644 (file)
--- 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 e0fc6b8c4a688f17d15c0fab44d432cfc5053e9a..582595ad8fe0f74921772f30e2e02fa4240cfa41 100644 (file)
--- 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;
 }