kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 203802 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203802 | russell | 2009-06-26 16:21:48 -0500 (Fri, 26 Jun 2009) | 22 lines
  
  Merged revisions 203785 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203785 | russell | 2009-06-26 16:16:39 -0500 (Fri, 26 Jun 2009) | 15 lines
    
    Don't fast forward past the end of a message.
    
    This is nice change for users of the voicemail application.  If someone gets a
    little carried away with fast forwarding through a message, they can easily
    get to the end and accidentally exit the voicemail application by hitting the
    fast forward key during the following prompt.
    
    This adds some safety by not allowing a fast forward past the end of a message.
    
    (closes issue #14554)
    Reported by: lacoursj
    Patches:
          21761.patch uploaded by lacoursj (license 707)
    Tested by: lacoursj
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-26 21:26:50 +00:00
parent 41c332513f
commit 910aaac5ae
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/file.c
View File

@@ -1227,7 +1227,14 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
} else {
res = fr->subclass;
if (strchr(forward, res)) {
int eoftest;
ast_stream_fastforward(c->stream, skip_ms);
eoftest = fgetc(c->stream->f);
if (feof(c->stream->f)) {
ast_stream_rewind(c->stream, skip_ms);
} else {
ungetc(eoftest, c->stream->f);
}
} else if (strchr(reverse, res)) {
ast_stream_rewind(c->stream, skip_ms);
} else if (strchr(breakon, res)) {