diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-26 16:44:54 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-26 16:44:54 +0000 |
| commit | 4ec171fa6bb5f74c8342b28bbfdc5785d0fb2d82 (patch) | |
| tree | f8b457f5f616c252bc87094d6af671f37b1ee89f | |
| parent | 447c900c5b6479086cf79bbc12453ea22a213383 (diff) | |
Merged revisions 178801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r178801 | file | 2009-02-26 12:42:36 -0400 (Thu, 26 Feb 2009) | 5 lines
Fix an issue where the timer for file playback would not be stopped if DAHDI was not installed.
(closes issue #14541)
Reported by: grant
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@178803 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/file.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/main/file.c b/main/file.c index ef621925b..44f064a02 100644 --- a/main/file.c +++ b/main/file.c @@ -292,9 +292,7 @@ static void filestream_destructor(void *arg) if (f->fmt->format < AST_FORMAT_AUDIO_MASK) { f->owner->stream = NULL; AST_SCHED_DEL(f->owner->sched, f->owner->streamid); -#ifdef HAVE_DAHDI ast_settimeout(f->owner, 0, NULL, NULL); -#endif } else { f->owner->vstream = NULL; AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid); |