From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 23 Jul 2009 19:21:50 +0000 (+0000)
Subject: Merged revisions 208380 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4448
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcd6227f6cb9f0b59c8eb05f08a3069cad9696ba;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@208383 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 37aabc5d4e..2eb86ba47c 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -10426,6 +10426,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		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 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		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) {