kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 208380 via svnmerge from

Browse Source 
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
This commit is contained in:
Jeff Peeler
2009-07-23 19:21:50 +00:00
parent bacf6ab51e
commit dcd6227f6c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_dahdi.c
View File

@@ -10426,6 +10426,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
for (x = 0; x < 3; x++) for (x = 0; x < 3; x++)
tmp->subs[x].dfd = -1; tmp->subs[x].dfd = -1;
tmp->channel = channel; tmp->channel = channel;
tmp->priindication_oob = conf->chan.priindication_oob;
} }
if (tmp) { 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->dahditrcallerid = conf->chan.dahditrcallerid;
tmp->restrictcid = conf->chan.restrictcid; tmp->restrictcid = conf->chan.restrictcid;
tmp->use_callingpres = conf->chan.use_callingpres; tmp->use_callingpres = conf->chan.use_callingpres;
tmp->priindication_oob = conf->chan.priindication_oob;
tmp->priexclusive = conf->chan.priexclusive; tmp->priexclusive = conf->chan.priexclusive;
if (tmp->usedistinctiveringdetection) { if (tmp->usedistinctiveringdetection) {
if (!tmp->use_callerid) { if (!tmp->use_callerid) {