Changeset b556e46 for root_commands.c


Ignore:
Timestamp:
2010-07-09T23:25:07Z (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • root_commands.c

    rc5bff81 rb556e46  
    680680static void cmd_rename( irc_t *irc, char **cmd )
    681681{
    682         irc_user_t *iu;
     682        irc_user_t *iu, *old;
    683683       
    684684        iu = irc_user_by_name( irc, cmd[1] );
     
    696696                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
    697697        }
    698         else if( irc_user_by_name( irc, cmd[2] ) )
     698        else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
    699699        {
    700700                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
Note: See TracChangeset for help on using the changeset viewer.