X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=res%2Fres_xmpp.c;h=2a087b055b9d90eeeaa0faba0f32ceb4c2a72ebb;hp=5a3670e7d63a1952b5cf396c94a1887ecdedd41f;hb=50044fdc15197b3a4a742827c97fc25daddc98aa;hpb=f66c41e668429b9a07dfdf30832c02ddc223f4a4;ds=sidebyside

diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 5a3670e..2a087b0 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");
 	}