diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-09-21 19:48:35 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-09-21 19:48:35 +0000 |
| commit | 821022dd35b2ed5b4e4695d0527da2939cc1574b (patch) | |
| tree | b1753170eda2f68e28fd260e5934cf7da3c3b0d6 /apps | |
| parent | f66b5657e080843f4596dfcd93551e90fd47780d (diff) | |
Merged revisions 43441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43441 | tilghman | 2006-09-21 14:43:32 -0500 (Thu, 21 Sep 2006) | 2 lines
Oops, missed the merge breakage
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_rpt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 328cc2a6b..305e59eb4 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -1886,7 +1886,7 @@ static int get_wait_interval(struct rpt *myrpt, int type) const char *wait_times; char *wait_times_save = NULL; - wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times"); + wait_times = ast_variable_retrieve(myrpt->cfg, myrpt->name, "wait_times"); if (wait_times) { wait_times_save = ast_strdupa(wait_times); @@ -1899,28 +1899,28 @@ static int get_wait_interval(struct rpt *myrpt, int type) switch (type) { case DLY_TELEM: if (wait_times) - interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000); + interval = retrieve_astcfgint(myrpt, wait_times_save, "telemwait", 500, 5000, 1000); else interval = 1000; break; case DLY_ID: if (wait_times) - interval = retrieve_astcfgint(wait_times_save, "idwait", 250, 5000, 500); + interval = retrieve_astcfgint(myrpt, wait_times_save, "idwait", 250, 5000, 500); else interval = 500; break; case DLY_UNKEY: if (wait_times) - interval = retrieve_astcfgint(wait_times_save, "unkeywait", 500, 5000, 1000); + interval = retrieve_astcfgint(myrpt, wait_times_save, "unkeywait", 500, 5000, 1000); else interval = 1000; break; case DLY_CALLTERM: if (wait_times) - interval = retrieve_astcfgint(wait_times_save, "calltermwait", 500, 5000, 1500); + interval = retrieve_astcfgint(myrpt, wait_times_save, "calltermwait", 500, 5000, 1500); else interval = 1500; break; @@ -1929,7 +1929,7 @@ static int get_wait_interval(struct rpt *myrpt, int type) return 0; } return interval; -} +} /* |