X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=4609e4cb786a94fb47b22171396c0b23a203fa59;hb=e834c977cc3dd0ffaf4433b0f267f3436151a82b;hp=4de6490329e73b578c8fa54772fe6053cee9487f;hpb=477a4a1b836a9693338dd2ef76782013f3fb0a16;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 4de6490..4609e4c 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -29,6 +29,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 #include "log.h"
 #include "list.h"
 #include "client.h"
@@ -212,6 +214,7 @@ void Chan_init()
 			ch_dst = ch_itr;
 		
 		list_add_tail(&ch_dst->link_node, &ch_src->channel_links);
+		ch_src->linkcount++;
 		Log_info("Adding channel link '%s' -> '%s'", ch_src->name, ch_dst->name);
 	}
 }
@@ -273,9 +276,12 @@ int Chan_userLeave(client_t *client)
 int Chan_userJoin(channel_t *ch, client_t *client)
 {
 	int leaving_id;
+
+	/* Do nothing if user already is in this channel */
+	if ((channel_t *)client->channel == ch)
+		return 0;
 	
 	Log_debug("Add user %s to channel %s", client->username, ch->name); 
-
 	/* Only allowed in one channel at a time */
 	leaving_id = Chan_userLeave(client);
 	list_add_tail(&client->chan_node, &ch->clients);