From: Joshua Colp <jcolp@digium.com>
Date: Thu, 26 Feb 2009 16:42:36 +0000 (+0000)
Subject: Fix an issue where the timer for file playback would not be stopped if DAHDI was... 
X-Git-Tag: 1.6.2.0-beta1~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f7f4a0c8454717f920b634117feff60461d6d82;p=thirdparty%2Fasterisk.git

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/trunk@178801 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/file.c b/main/file.c
index d4aeea720b..7771a77c48 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);