projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0726876
)
fixing client crash during core init
author
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 24 Jul 2008 10:02:52 +0000
(12:02 +0200)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 24 Jul 2008 10:02:52 +0000
(12:02 +0200)
src/client/client.cpp
patch
|
blob
|
history
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
6ce23d5
..
e936be5
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-587,7
+587,9
@@
void Client::checkForHighlight(Message &msg) {
if(notificationSettings.highlightNick() == NotificationSettings::CurrentNick) {
nickList << net->myNick();
} else if(notificationSettings.highlightNick() == NotificationSettings::AllNicks) {
- nickList = identity(net->identity())->nicks();
+ const Identity *myIdentity = identity(net->identity());
+ if(myIdentity)
+ nickList = myIdentity->nicks();
}
foreach(QString nickname, nickList) {
QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");