diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-16 21:19:23 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-16 21:19:23 +0000 |
| commit | 3342ca21fc6cd57a6c858bee7bc5acb562a22afe (patch) | |
| tree | c28c16e7244c75587046414ed73f410d8562beec /apps/app_stack.c | |
| parent | 8701e03b92e49b59d371b5b7c91ddb67e43ac4dd (diff) | |
Merged revisions 123165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines
(closes issue #12689)
Reported by: ys
Many thanks to ys for doing the research on this problem.
I didn't think it would be best to unlock the contexts
and then relock them after the remove_extension2() call,
so I added an extra arg to remove_extension2() and set it
appropriately in each call. There were not that many.
I considered forcing the code to lock the contexts before
the call to remove_extension2(), but that would require
a slightly greater degree of changes, especially since
the find_context_locked is local to pbx.c
I did a simple sanity test to make sure the code doesn't
mess things up in general.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123173 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_stack.c')
| -rw-r--r-- | apps/app_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 9e6c0dadd..3dc06904f 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -493,7 +493,7 @@ static int unload_module(void) ast_agi_unregister(ast_module_info->self, &gosub_agi_command); if ((con = ast_context_find("app_stack_gosub_virtual_context"))) { - ast_context_remove_extension2(con, "s", 1, NULL); + ast_context_remove_extension2(con, "s", 1, NULL, 0); ast_context_destroy(con, "app_stack"); /* leave nothing behind */ } } |