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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208385 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 010d46c537eda6a736af3f355f3bd00d8bc19c7c..f889a77ab24ea29200be7f4415501a05b684717e 100644 (file)
--- 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) {