mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
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/branches/1.4@208380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -7653,6 +7653,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) {
|
||||
@@ -7953,7 +7954,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
Block a user