diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-07-23 19:21:50 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-07-23 19:21:50 +0000 |
| commit | dcd6227f6cb9f0b59c8eb05f08a3069cad9696ba (patch) | |
| tree | b8b8280d2854b1795b75f18da830495c8a2ea9c9 /channels/chan_dahdi.c | |
| parent | bacf6ab51efd1c350aac0ee96608f899bfc5f37e (diff) | |
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
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 37aabc5d4..2eb86ba47 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) { |