diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_hep_rtcp.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_mwi.c | 2 | ||||
| -rw-r--r-- | res/res_security_log.c | 2 | ||||
| -rw-r--r-- | res/res_stasis_device_state.c | 2 | ||||
| -rw-r--r-- | res/res_xmpp.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/res/res_hep_rtcp.c b/res/res_hep_rtcp.c index fe39f195b..787512bbf 100644 --- a/res/res_hep_rtcp.c +++ b/res/res_hep_rtcp.c @@ -131,7 +131,7 @@ static int load_module(void) static int unload_module(void) { if (stasis_rtp_subscription) { - stasis_rtp_subscription = stasis_unsubscribe(stasis_rtp_subscription); + stasis_rtp_subscription = stasis_unsubscribe_and_join(stasis_rtp_subscription); } return 0; diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c index 2ab7dfee0..76e0e4c35 100644 --- a/res/res_pjsip_mwi.c +++ b/res/res_pjsip_mwi.c @@ -471,7 +471,7 @@ static int unsubscribe_stasis(void *obj, void *arg, int flags) struct mwi_stasis_subscription *mwi_stasis = obj; if (mwi_stasis->stasis_sub) { ast_debug(3, "Removing stasis subscription to mailbox %s\n", mwi_stasis->mailbox); - mwi_stasis->stasis_sub = stasis_unsubscribe(mwi_stasis->stasis_sub); + mwi_stasis->stasis_sub = stasis_unsubscribe_and_join(mwi_stasis->stasis_sub); } return CMP_MATCH; } diff --git a/res/res_security_log.c b/res/res_security_log.c index 78ca1218c..c3fb3cfd2 100644 --- a/res/res_security_log.c +++ b/res/res_security_log.c @@ -152,7 +152,7 @@ static int load_module(void) static int unload_module(void) { if (security_stasis_sub) { - security_stasis_sub = stasis_unsubscribe(security_stasis_sub); + security_stasis_sub = stasis_unsubscribe_and_join(security_stasis_sub); } ast_logger_unregister_level(LOG_SECURITY_NAME); diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c index 8a1c23049..aec6a6eca 100644 --- a/res/res_stasis_device_state.c +++ b/res/res_stasis_device_state.c @@ -105,7 +105,7 @@ static int device_state_subscriptions_cmp(void *obj, void *arg, int flags) static void device_state_subscription_destroy(void *obj) { struct device_state_subscription *sub = obj; - sub->sub = stasis_unsubscribe(sub->sub); + sub->sub = stasis_unsubscribe_and_join(sub->sub); ast_string_field_free_memory(sub); } diff --git a/res/res_xmpp.c b/res/res_xmpp.c index 9d21297b0..d9791431d 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -3568,12 +3568,12 @@ int ast_xmpp_client_disconnect(struct ast_xmpp_client *client) } if (client->mwi_sub) { - client->mwi_sub = stasis_unsubscribe(client->mwi_sub); + client->mwi_sub = stasis_unsubscribe_and_join(client->mwi_sub); xmpp_pubsub_unsubscribe(client, "message_waiting"); } if (client->device_state_sub) { - client->device_state_sub = stasis_unsubscribe(client->device_state_sub); + client->device_state_sub = stasis_unsubscribe_and_join(client->device_state_sub); xmpp_pubsub_unsubscribe(client, "device_state"); } |