summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2012-09-05 19:08:15 +0000
committerKinsey Moore <kmoore@digium.com>2012-09-05 19:08:15 +0000
commit8fb1897e89e3518d11e403df382f5c1eb7bd7520 (patch)
tree46c9e66300bffec5d7d4bcc3f2041708bede5610
parentd39b4170743b2bd59743bcf290f324421a187b6d (diff)
Ensure counts generated in manager_show_dialplan_helper are correct
When manager_show_dialplan_helper was written, the counter increment for the total number of contexts was placed with the extensions increment instead of in the enclosing loop. This function should now generate correct context counts. (closes issue AST-970) Reported-by: John Bigelow ........ Merged revisions 372337 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 372338 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 372340 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/pbx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 1acb811a4..d2b2aa16e 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7769,6 +7769,7 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
continue; /* not the name we want */
dpc->context_existence = 1;
+ dpc->total_context++;
ast_debug(3, "manager_show_dialplan: Found Context: %s \n", ast_get_context_name(c));
@@ -7792,8 +7793,6 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
dpc->extension_existence = 1;
- /* may we print context info? */
- dpc->total_context++;
dpc->total_exten++;
p = NULL; /* walk next extension peers */