[asterisk-commits] jpeeler: branch 1.6.1 r203856 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jun 26 17:13:37 2009
New Revision: 203856

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203856
Log:
Merged revisions 203853 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203853 | jpeeler | 2009-06-26 17:11:31 -0500 (Fri, 26 Jun 2009) | 12 lines
  
  Merged revisions 203848 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203848 | jpeeler | 2009-06-26 17:09:19 -0500 (Fri, 26 Jun 2009) | 5 lines
    
    Make sure to recreate the dahdi pseudo channel after dahdi restart
    
    (closes issue #14477)
    Reported by: timking
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

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

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=203856&r1=203855&r2=203856
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Jun 26 17:13:37 2009
@@ -15054,7 +15054,7 @@
 	}
 	/*< \todo why check for the pseudo in the per-channel section.
 	 * Any actual use for manual setup of the pseudo channel? */
-	if (!found_pseudo && reload == 0) {
+	if (!found_pseudo && reload != 1) {
 		/* use the default configuration for a channel, so
 		   that any settings from real configured channels
 		   don't "leak" into the pseudo channel config