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: http://svn.digium.com/svn/asterisk/trunk@208383 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
26519fab7f
commit
cff73a829e
|
@ -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) {
|
||||
|
|
Reference in New Issue