aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2020-11-18 16:40:53 +0100
committerPaweł Chmielowski <pchmielowski@process-one.net>2020-11-18 16:49:43 +0100
commite306cb07977521ef457c067782b6c0da8c93eec2 (patch)
tree0c365ada68b8a617b0b25db9092a7344046df21e
parentMerge pull request #3402 from nosnilmot/docker-fixes (diff)
Fix logic that determines room age when history_size=0
-rw-r--r--src/mod_muc_admin.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 8ba07f83a..b5c8e7363 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -891,9 +891,8 @@ decide_room(unused, {_Room_name, _Host, ServerHost, Room_pid}, Last_allowed) ->
end
end,
Ts_now = calendar:universal_time(),
- HistorySize = mod_muc_opt:history_size(ServerHost),
{Has_hist, Last} = case p1_queue:is_empty(History) of
- true when (HistorySize == 0) or (Just_created == true) ->
+ true when Just_created == true ->
{false, 0};
true ->
Ts_diff = (erlang:system_time(microsecond)