From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 24 Jul 2008 10:02:52 +0000 (+0200)
Subject: fixing client crash during core init
X-Git-Tag: 0.3.0~221
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=733eedc159bd22a9f5e307e2db3d075eedc3b7a9

fixing client crash during core init
---

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.*)?$");