[asterisk-commits] jpeeler: trunk r208383 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Jul 23 14:21:50 2009
New Revision: 208383

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208383
Log:
Merged revisions 208380 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r208380 | jpeeler | 2009-07-23 14:19:53 -0500 (Thu, 23 Jul 2009) | 6 lines
  
  Only set the priindication setting when not performing a reload
  
  (closes issue #14696)
  Reported by: fdecher
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=208383&r1=208382&r2=208383
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Thu Jul 23 14:21:50 2009
@@ -10426,6 +10426,7 @@
 		for (x = 0; x < 3; x++)
 			tmp->subs[x].dfd = -1;
 		tmp->channel = channel;
+		tmp->priindication_oob = conf->chan.priindication_oob;
 	}
 
 	if (tmp) {
@@ -10866,7 +10867,6 @@
 		tmp->dahditrcallerid = conf->chan.dahditrcallerid;
 		tmp->restrictcid = conf->chan.restrictcid;
 		tmp->use_callingpres = conf->chan.use_callingpres;
-		tmp->priindication_oob = conf->chan.priindication_oob;
 		tmp->priexclusive = conf->chan.priexclusive;
 		if (tmp->usedistinctiveringdetection) {
 			if (!tmp->use_callerid) {