diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-23 19:24:06 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-23 19:24:06 +0000 |
| commit | 435a99c70c4237f1042b9f3464ba2d8ab88af03b (patch) | |
| tree | 1faff623fff16da43389c7a14dc26067c2147722 /channels | |
| parent | 2981b83b942c83965332b8dcddcd347282032185 (diff) | |
Merged revisions 208383 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r208383 | jpeeler | 2009-07-23 14:21:50 -0500 (Thu, 23 Jul 2009) | 12 lines
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/branches/1.6.1@208385 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 010d46c53..f889a77ab 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8758,6 +8758,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) { @@ -9119,7 +9120,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) { |