X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=77ee4157dfe3fba941e29a76a6561c2d5b8e55b8;hb=797ef770d8ccc7e94dd7fef15d3659ef814baddd;hp=3524a966f9c958dfe52ca70eefc296596c0172ed;hpb=14a67bc74c81651015bbbad075f7eb1c41218cf7;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 3524a96..77ee415 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -276,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);