Changeset b556e46 for root_commands.c

Timestamp:

2010-07-09T23:25:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3b6764

Parents:

c5bff81 (diff), 9a9b520 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging main ui-fix.

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -680 +680 @@
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
+        irc_user_t *iu, *old;
         
         iu = irc_user_by_name( irc, cmd[1] );
@@ -696 +696 @@
                 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
-        else if( irc_user_by_name( irc, cmd[2] ) )
+        else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
                 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );