X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e936be5d89a27c6020a1900519dc87ec188b65c7;hp=6ce23d581623b8933aedbda43bf48b2455206189;hb=733eedc159bd22a9f5e307e2db3d075eedc3b7a9;hpb=07268765f40e145ca292a32de6aeb367dc5169a1

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 6ce23d58..e936be5d 100644
--- 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.*)?$");