diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-04-29 05:51:18 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-04-29 05:51:18 +0000 |
commit | 0efe5118799c1c8bdff97b78571bd507017a85a2 (patch) | |
tree | b28472e64e9e7f8355061798cc67c51d9ad31492 /channels | |
parent | 28244e7462daf67a6cd0a8535b0881e1a0cf1968 (diff) |
Merged revisions 62331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62331 | russell | 2007-04-29 00:50:37 -0500 (Sun, 29 Apr 2007) | 3 lines
Fix a bug that made the "language" setting in zapata.conf not
functional. (issue #9626, reported and fixed by sergee)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_zap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 3703b40f9..47904b818 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -213,7 +213,6 @@ static const char config[] = "zapata.conf"; static char defaultcic[64] = ""; static char defaultozz[64] = ""; -static char language[MAX_LANGUAGE] = ""; static char progzone[10] = ""; static int usedistinctiveringdetection = 0; @@ -7890,7 +7889,7 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr tmp->canpark = conf.chan.canpark; tmp->transfer = conf.chan.transfer; ast_copy_string(tmp->defcontext,conf.chan.context,sizeof(tmp->defcontext)); - ast_copy_string(tmp->language, language, sizeof(tmp->language)); + ast_copy_string(tmp->language, conf.chan.language, sizeof(tmp->language)); ast_copy_string(tmp->mohinterpret, conf.chan.mohinterpret, sizeof(tmp->mohinterpret)); ast_copy_string(tmp->mohsuggest, conf.chan.mohsuggest, sizeof(tmp->mohsuggest)); ast_copy_string(tmp->context, conf.chan.context, sizeof(tmp->context)); |