X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkinfo.cpp;h=8836a702a0e8b60b280ddb1c0a8f863988311fee;hp=ddc9b81f6a16b3a4c955c87511a36ab88dfbdd1b;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=a1f065fb6bba082c6e4edaaea2d2f7fc98a7fde9

diff --git a/src/common/networkinfo.cpp b/src/common/networkinfo.cpp
index ddc9b81f..8836a702 100644
--- a/src/common/networkinfo.cpp
+++ b/src/common/networkinfo.cpp
@@ -322,7 +322,7 @@ void NetworkInfo::initSetChannels(const QStringList &channels) {
 }
 
 IrcUser *NetworkInfo::updateNickFromMask(const QString &mask) {
-  QString nick(nickFromMask(mask));
+  QString nick(nickFromMask(mask).toLower());
   IrcUser *ircuser;
   
   if(_ircUsers.contains(nick)) {
@@ -336,13 +336,13 @@ IrcUser *NetworkInfo::updateNickFromMask(const QString &mask) {
 
 void NetworkInfo::ircUserNickChanged(QString newnick) {
   QString oldnick = _ircUsers.key(qobject_cast<IrcUser*>(sender()));
-  
+
   if(oldnick.isNull())
     return;
+
+  if(newnick.toLower() != oldnick) _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick);
   
-  _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick);
-  
-  if(myNick() == oldnick)
+  if(myNick().toLower() == oldnick)
     setMyNick(newnick);
 }