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-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=f44c9f12440069e6e765072049c7c3f02259821f;p=quassel.git

fixing client crash during core init
---

diff --git a/src/client/client.cpp b/src/client/client.cpp
index d8e797b8..5b56b355 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -561,7 +561,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.*)?$");