diff options
| author |  Fabio Bas | 2011-06-27 08:18:53 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-06-27 08:18:53 +0000 |
| commit | 3e5ba84411a8bb94408ed5f86a4d41e7b6df1291 (patch) | |
| tree | d8ab65248c76a1bbd380daf4f84da16648ed467a | |
| parent | fixed OnHighlight's description, thanks TheRipper (diff) | |
| download | KVIrc-3e5ba84411a8bb94408ed5f86a4d41e7b6df1291.tar.gz KVIrc-3e5ba84411a8bb94408ed5f86a4d41e7b6df1291.tar.bz2 KVIrc-3e5ba84411a8bb94408ed5f86a4d41e7b6df1291.zip | |
fix for #1165
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5881 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/KviIrcConnection.cpp | 1 | ||||
| -rw-r--r-- | src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp index 9bf6e55dd..a34cd23a7 100644 --- a/src/kvirc/kernel/KviIrcConnection.cpp +++ b/src/kvirc/kernel/KviIrcConnection.cpp @@ -1645,7 +1645,6 @@ void KviIrcConnection::nickChange(const QString & szNewNick) // FIXME: should the new nickname be decoded in some way ? m_pConsole->notifyListView()->nickChange(m_pUserInfo->nickName(),szNewNick); m_pUserInfo->setNickName(szNewNick); - m_pConsole->output(KVI_OUT_NICK,__tr2qs("You have changed your nickname to %Q"),&szNewNick); m_pConsole->updateCaption(); m_pConsole->frame()->childConnectionNickNameChange(this); emit nickNameChanged(); diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index e7699381a..3698e2ac5 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -1534,6 +1534,9 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg) { if(console->connection()) { + if(!msg->haltOutput()) + console->output(KVI_OUT_NICK,__tr2qs("You have changed your nickname to %Q"),&szNewNick); + // just update all the captions : we have changed OUR nick for( KviQueryWindow * q = console->connection()->queryList()->first(); |