sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_stasis: Fix dial bridge unload."

This commit is contained in:
Joshua Colp 2018-01-09 07:01:45 -06:00 committed by Gerrit Code Review
parent 44edb06b81 8b3083cac5
commit 2e4bd3a8d5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_stasis.c
View File

@ -1992,6 +1992,9 @@ static int unload_module(void)
messaging_cleanup();
cleanup();
stasis_app_control_shutdown();
ao2_cleanup(apps_registry);
apps_registry = NULL;
@ -2007,8 +2010,6 @@ static int unload_module(void)
ao2_cleanup(app_bridges_playback);
app_bridges_playback = NULL;
stasis_app_control_shutdown();
STASIS_MESSAGE_TYPE_CLEANUP(end_message_type);
STASIS_MESSAGE_TYPE_CLEANUP(start_message_type);

6
res/stasis/control.c
View File

@ -1544,7 +1544,9 @@ void stasis_app_control_shutdown(void)
{
ast_mutex_lock(&dial_bridge_lock);
shutting_down = 1;
ao2_cleanup(dial_bridge);
dial_bridge = NULL;
if (dial_bridge) {
ast_bridge_destroy(dial_bridge, 0);
dial_bridge = NULL;
}
ast_mutex_unlock(&dial_bridge_lock);
}