diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/channel_internal_api.c | 3 | ||||
-rw-r--r-- | main/manager.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c index d646d8485..0867524d6 100644 --- a/main/channel_internal_api.c +++ b/main/channel_internal_api.c @@ -1367,8 +1367,7 @@ void ast_channel_internal_cleanup(struct ast_channel *chan) ast_string_field_free_memory(chan); - stasis_unsubscribe(chan->forwarder); - chan->forwarder = NULL; + chan->forwarder = stasis_unsubscribe(chan->forwarder); ao2_cleanup(chan->topic); chan->topic = NULL; diff --git a/main/manager.c b/main/manager.c index d5d5ccc26..821fde8db 100644 --- a/main/manager.c +++ b/main/manager.c @@ -7590,8 +7590,7 @@ static void manager_shutdown(void) { struct ast_manager_user *user; - stasis_unsubscribe(channel_state_sub); - channel_state_sub = NULL; + channel_state_sub = stasis_unsubscribe(channel_state_sub); if (registered) { ast_manager_unregister("Ping"); |