From 2fa6e2fd9065b0a2d669b9c02ebbddab31b4f934 Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 21 Aug 2017 15:57:48 +0200 Subject: [PATCH 1/2] Fix crash when destroying room without providing reason (#1954) --- src/mod_muc_room.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 2a1ca6011..fde43694c 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -492,7 +492,7 @@ handle_event({destroy, Reason}, _StateName, handle_event(destroy, StateName, StateData) -> ?INFO_MSG("Destroyed MUC room ~s", [jid:encode(StateData#state.jid)]), - handle_event({destroy, undefined}, StateName, StateData); + handle_event({destroy, <<"">>}, StateName, StateData); handle_event({set_affiliations, Affiliations}, StateName, StateData) -> {next_state, StateName, From 05c2995c7a4c2afb8481826f9dbe9ed9ec0b282b Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 21 Aug 2017 15:58:10 +0200 Subject: [PATCH 2/2] When creating room, set option to ensure config is set in muc_room table (#1954) --- src/mod_muc_admin.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index 332c83b55..5197c1b71 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -536,7 +536,8 @@ prepare_room_info(Room_info) -> %% ok | error %% @doc Create a room immediately with the default options. create_room(Name1, Host1, ServerHost) -> - create_room_with_opts(Name1, Host1, ServerHost, []). + create_room_with_opts(Name1, Host1, ServerHost, []), + change_room_option(Name1, Host1, <<"persistent">>, <<"true">>). create_room_with_opts(Name1, Host1, ServerHost, CustomRoomOpts) -> true = (error /= (Name = jid:nodeprep(Name1))),