Set log file output as line-buffered

[umurmur.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 1fab5a4a793cdde82849bb36373798d03697c40e..77ee4157dfe3fba941e29a76a6561c2d5b8e55b8 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -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"
@@ -274,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);