aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-26 22:13:37 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-26 22:13:37 +0000
commit65f00b7c539a94f10f7298013deb63620e070a19 (patch)
tree1da61bbd75de6e8221da09a89c02c9aee4ec24ab /channels
parent9c1e1b8e32d199fcb824ce88129f1036847a23c2 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@203856 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 8f431684c..d41e90483 100644
--- 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