mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 03:48:02 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@178803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user