[asterisk-commits] file: branch 1.6.1 r178803 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Feb 26 10:44:54 2009
New Revision: 178803

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=178803
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/file.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=178803&r1=178802&r2=178803
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Thu Feb 26 10:44:54 2009
@@ -292,9 +292,7 @@
 		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);