diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 21:16:39 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 21:16:39 +0000 |
| commit | cbc946c26d5e2edfee176a614efddc53a8de0c29 (patch) | |
| tree | d697b371408d7f4ad1e539d8c5747440500ea116 | |
| parent | 238e462197946d7255dc32019cde299a2fd7d392 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@203785 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index eaee04220..f39268fe3 100644 --- a/main/file.c +++ b/main/file.c @@ -1236,7 +1236,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(rewind,res)) { ast_stream_rewind(c->stream, skip_ms); } else if (strchr(breakon, res)) { |