Changes in irc_commands.c [e1f3f94:9a9b520]

File:

• irc_commands.c (modified) (2 diffs)

irc_commands.c

@@ -72 +72 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc_user_by_name( irc, cmd[1] ) )
-        {
-                irc_send_num( irc, 433, ":This nick is already in use" );
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[1] ) ) && iu != irc->user )
+        {
+                irc_send_num( irc, 433, "%s :This nick is already in use", cmd[1] );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_send_num( irc, 432, ":This nick contains invalid characters" );
-        }
-        else if( irc->user->nick )
+                irc_send_num( irc, 432, "%s :This nick contains invalid characters", cmd[1] );
+        }
+        else if( irc->status & USTATUS_LOGGED_IN )
         {
                 if( irc->status & USTATUS_IDENTIFIED )
@@ -98 +100 @@
         else
         {
+                g_free( irc->user->nick );
                 irc->user->nick = g_strdup( cmd[1] );