Merge "res_stasis: Fix dial bridge unload."
This commit is contained in:
commit
2e4bd3a8d5
|
@ -1992,6 +1992,9 @@ static int unload_module(void)
|
||||||
messaging_cleanup();
|
messaging_cleanup();
|
||||||
|
|
||||||
cleanup();
|
cleanup();
|
||||||
|
|
||||||
|
stasis_app_control_shutdown();
|
||||||
|
|
||||||
ao2_cleanup(apps_registry);
|
ao2_cleanup(apps_registry);
|
||||||
apps_registry = NULL;
|
apps_registry = NULL;
|
||||||
|
|
||||||
|
@ -2007,8 +2010,6 @@ static int unload_module(void)
|
||||||
ao2_cleanup(app_bridges_playback);
|
ao2_cleanup(app_bridges_playback);
|
||||||
app_bridges_playback = NULL;
|
app_bridges_playback = NULL;
|
||||||
|
|
||||||
stasis_app_control_shutdown();
|
|
||||||
|
|
||||||
STASIS_MESSAGE_TYPE_CLEANUP(end_message_type);
|
STASIS_MESSAGE_TYPE_CLEANUP(end_message_type);
|
||||||
STASIS_MESSAGE_TYPE_CLEANUP(start_message_type);
|
STASIS_MESSAGE_TYPE_CLEANUP(start_message_type);
|
||||||
|
|
||||||
|
|
|
@ -1544,7 +1544,9 @@ void stasis_app_control_shutdown(void)
|
||||||
{
|
{
|
||||||
ast_mutex_lock(&dial_bridge_lock);
|
ast_mutex_lock(&dial_bridge_lock);
|
||||||
shutting_down = 1;
|
shutting_down = 1;
|
||||||
ao2_cleanup(dial_bridge);
|
if (dial_bridge) {
|
||||||
dial_bridge = NULL;
|
ast_bridge_destroy(dial_bridge, 0);
|
||||||
|
dial_bridge = NULL;
|
||||||
|
}
|
||||||
ast_mutex_unlock(&dial_bridge_lock);
|
ast_mutex_unlock(&dial_bridge_lock);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue