From b699ac03fbf586261ecc605007993c563e15050b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 11 Aug 2014 11:36:30 +0200
Subject: mod_muc: Fix tracebacks (thanks nick1)

---
 plugins/muc/mod_muc.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 3f01ee11..5abde57c 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -97,11 +97,12 @@ local function restore_room(jid)
 	end
 end
 
-function forget_room(jid)
-	rooms[jid] = nil;
+function forget_room(room)
+	local room_jid = room.jid;
 	local node = jid_split(room.jid);
+	rooms[room_jid] = nil;
 	room_configs:set(node, nil);
-	if persistent.get(room_jid) then
+	if persistent.get(room) then
 		persistent_rooms:set(nil, room_jid, nil);
 	end
 end
@@ -148,8 +149,7 @@ module:hook("muc-room-pre-create", function(event)
 end, -1000);
 
 module:hook("muc-room-destroyed",function(event)
-	local room = event.room
-	forget_room(room.jid)
+	return forget_room(event.room);
 end)
 
 do
-- 
cgit v1.2.3