diff options
| -rw-r--r-- | src/mod_muc.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_muc.erl b/src/mod_muc.erl index fbaacc9dd..1aa48291c 100644 --- a/src/mod_muc.erl +++ b/src/mod_muc.erl @@ -681,7 +681,7 @@ iq_disco_items(_ServerHost, _Host, _From, Lang, _MaxRoomsDiscoItems, _Node, _RSM -spec get_room_disco_item({binary(), binary(), pid()}, term()) -> {ok, disco_item()} | - {error, timeout | notfound}. + {error, timeout | notfound}. get_room_disco_item({Name, Host, Pid}, Query) -> RoomJID = jid:make(Name, Host), try p1_fsm:sync_send_all_state_event(Pid, Query, 100) of @@ -689,9 +689,9 @@ get_room_disco_item({Name, Host, Pid}, Query) -> {ok, #disco_item{jid = RoomJID, name = Desc}}; false -> {error, notfound} - catch _:{timeout, _} -> + catch _:{timeout, {p1_fsm, _, _}} -> {error, timeout}; - _:{noproc, _} -> + _:{_, {p1_fsm, _, _}} -> {error, notfound} end. |