summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/message.c4
-rw-r--r--res/res_xmpp.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/main/message.c b/main/message.c
index 26fea1aca..c04413dc8 100644
--- a/main/message.c
+++ b/main/message.c
@@ -752,6 +752,10 @@ static void chan_cleanup(struct ast_channel *chan)
if (msg_ds) {
ast_channel_datastore_add(chan, msg_ds);
}
+ /*
+ * Clear softhangup flags.
+ */
+ ast_channel_clear_softhangup(chan, AST_SOFTHANGUP_ALL);
ast_channel_unlock(chan);
}
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index ed4c95618..9e9d47c16 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -4204,6 +4204,8 @@ static int unload_module(void)
ast_manager_unregister("JabberSend");
ast_custom_function_unregister(&jabberstatus_function);
ast_custom_function_unregister(&jabberreceive_function);
+ aco_info_destroy(&cfg_info);
+ ao2_global_obj_release(globals);
ast_cond_destroy(&message_received_condition);
ast_mutex_destroy(&messagelock);