From ed5089c103f9bdbb64610a6aba685e6b05aa435f Mon Sep 17 00:00:00 2001
From: atomaka <atomaka@gmail.com>
Date: Fri, 12 Aug 2011 19:11:05 -0400
Subject: [PATCH] Don't overwrite settings if joining an already joined
 channel.

---
 ChatSaver.lua | 58 ++++++++++++---------------------------------------
 1 file changed, 13 insertions(+), 45 deletions(-)

diff --git a/ChatSaver.lua b/ChatSaver.lua
index dce25fe..a6be291 100644
--- a/ChatSaver.lua
+++ b/ChatSaver.lua
@@ -67,18 +67,20 @@ end
 --[[ EVENT FUNCTIONS ]] --
 
 function core:ProcessChannelChange(_,message,_,_,_,_,_,_,index,name)
-        if message == 'YOU_JOINED' then
-                local number,_,category = core:GetChannelInfo(name)
+	if message == 'YOU_JOINED' then
+		local number,_,category = core:GetChannelInfo(name)
                 
-                if category == 'CHANNEL_CATEGORY_CUSTOM' then
-                        ChatSaverDB[name] = {}
-                        ChatSaverDB[name]['frames'] = {}
-                        ChatSaverDB[name]['index'] = number
-                        ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true
-                end
-        elseif message == 'YOU_LEFT' then
-                ChatSaverDB[name] = nil
-        end
+		if category == 'CHANNEL_CATEGORY_CUSTOM' then
+			if ChatSaverDB[name] == nil then
+				ChatSaverDB[name] = {}
+				ChatSaverDB[name]['frames'] = {}
+				ChatSaverDB[name]['index'] = number
+				ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true
+			end
+		end
+	elseif message == 'YOU_LEFT' then
+		ChatSaverDB[name] = nil
+	end
 end
 
 function core:RejoinChannels(...)
@@ -128,42 +130,8 @@ function core:SetupChatSaver(...)
 	self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','ProcessChannelChange')
 end
 
-function core:StoreChannel(_,_,_,_,_,_,_,_,_,name)
-	local number,channelName,category = core:GetChannelInfo(name);
-	
-	if(category == 'CHANNEL_CATEGORY_CUSTOM') then	
-		ChatSaverDB[name] = {};
-		ChatSaverDB[name]['frames'] = {};
-		ChatSaverDB[name]['index'] = number;
-		ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true;
-	end
-	
-	self:UnregisterEvent('CHAT_MSG_CHANNEL_NOTICE');
-end
-
 --[[ HOOKED FUNCTIONS ]] --
 
-function core:JoinChannel(msg)
-	self.hooks[SlashCmdList].JOIN(msg);
-	
-	local name = gsub(msg,"%s*([^%s]+).*","%1");
-	
-	if(strlen(name) > 0 and string.match(name,"%a+")) then
-		self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','StoreChannel');
-	end
-end
-
-function core:LeaveChannel(msg)
-	self.hooks[SlashCmdList].LEAVE(msg);
-	
-	local id = gsub(msg,"%s*([^%s]+).*","%1");
-	
-	if(strlen(id) > 0) then
-		local _,name = core:GetChannelInfo(id);
-		ChatSaverDB[name] = nil;
-	end
-end
-
 function core:ToggleChatChannel(checked,channel)
 	if(ChatSaverDB[channel] == nil) then 
 		return;