Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: znc/znc
base: 8659d72
...
head fork: znc/znc
compare: 71636d2
  • 2 commits
  • 2 files changed
  • 3 commit comments
  • 1 contributor
Commits on Oct 19, 2011
@kylef kylef Make sure a IRCSock is authed before we use the nick
This fixes a bug where an unauthed IRC connection will cause your
clients nick to be the default nick. But this is before we update
the client to use this nick. If a client tried another nick when
connecting then they are still expecting this nick.
7e5144d
@kylef kylef Move me to the top of authors 71636d2
Showing with 4 additions and 3 deletions.
  1. +1 −1  AUTHORS
  2. +3 −2 src/Client.cpp
View
2  AUTHORS
@@ -7,6 +7,7 @@ SilverLeo
kroimon <znc@kroimon.de>
flakes
Alexey "DarthGandalf" Sokolov (http://asokolov.co.cc/)
+Kyle Fuller <inbox@kylefuller.co.u>
These people, in no particular order, have helped develop ZNC, for example by
sending in patches, writing new modules or finding significant bugs:
@@ -24,7 +25,6 @@ cnu - master of destruction (security issues)
Ingmar "KiNgMaR" Runge <mail@irsoft.de>
Michael "Svedrin" Ziegler <diese-addy@funzt-halt.net>
Robert Lacroix (http://www.robertlacroix.com)
-zynox
Martin "Nirjen" Martimeo <martin@martimeo.de>
Reed Loden <reed@reedloden.com>
Brian Campbell (bcampbell@splafinga.com)
View
5 src/Client.cpp
@@ -731,8 +731,9 @@ void CClient::PutModule(const CString& sModule, const CString& sLine) {
CString CClient::GetNick(bool bAllowIRCNick) const {
CString sRet;
- if ((bAllowIRCNick) && (IsAttached()) && (GetIRCSock())) {
- sRet = GetIRCSock()->GetNick();
+ const CIRCSock *pSock = GetIRCSock();
+ if (bAllowIRCNick && pSock && pSock->IsAuthed()) {
+ sRet = pSock->GetNick();
}
return (sRet.empty()) ? m_sNick : sRet;

Showing you all comments on commits in this comparison.

@Fredi

.uk ? :P

@kylef
Collaborator

Oh damn... Thanks for spotting

@Fredi

yw!

Something went wrong with that request. Please try again.