Merged revisions 203853 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r203853 | jpeeler | 2009-06-26 17:11:31 -0500 (Fri, 26 Jun 2009) | 12 lines

  Merged revisions 203848 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r203848 | jpeeler | 2009-06-26 17:09:19 -0500 (Fri, 26 Jun 2009) | 5 lines

    Make sure to recreate the dahdi pseudo channel after dahdi restart

    (closes issue #14477)
    Reported by: timking
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203856 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 8f431684c345b3ca7efabeea902e8813acd1617f..d41e904839f8be412fa7ea1abd7da0b59c82b2ea 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -15054,7 +15054,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
        }
        /*< \todo why check for the pseudo in the per-channel section.
         * Any actual use for manual setup of the pseudo channel? */
-       if (!found_pseudo && reload == 0) {
+       if (!found_pseudo && reload != 1) {
                /* use the default configuration for a channel, so
                   that any settings from real configured channels
                   don't "leak" into the pseudo channel config