Changeset 3625

Show
Ignore:
Timestamp:
03/17/07 14:29:39 (1 year ago)
Author:
timothy
Message:

Fixes the way we pick the alt nick when one is taken.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Chat Core/MVChatConnection.m

    r3597 r3625  
    317317 
    318318- (NSString *) nextAlternateNickname { 
    319         if( [[self alternateNicknames] count] && _nextAltNickIndex < [[self alternateNicknames] count] ) { 
    320                 NSString *nick = [[self alternateNicknames] objectAtIndex:_nextAltNickIndex]; 
    321                 _nextAltNickIndex++; 
    322                 return nick; 
    323         } 
    324  
     319        if( [[self alternateNicknames] count] && _nextAltNickIndex < [[self alternateNicknames] count] ) 
     320                return [[self alternateNicknames] objectAtIndex:_nextAltNickIndex++]; 
    325321        return nil; 
    326322} 

  • trunk/Chat Core/MVIRCChatConnection.m

    r3623 r3625  
    14591459        if( ! [self isConnected] ) { 
    14601460                NSString *nick = [self nextAlternateNickname]; 
    1461                 if( ! [nick length] ) nick = [[self nickname] stringByAppendingString:@"_"]; 
     1461                if( ! [nick length] && [parameters count] >= 2 ) { 
     1462                        NSString *lastNickTried = [self _stringFromPossibleData:[parameters objectAtIndex:1]]; 
     1463                        nick = [lastNickTried stringByAppendingString:@"_"]; 
     1464                } 
     1465 
    14621466                if( [nick length] ) [self sendRawMessage:[NSString stringWithFormat:@"NICK %@", nick] immediately:YES]; 
    14631467        }