fixing client crash during core init

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ea1738b..e936be5 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -72,8 +72,8 @@ Client::Client(QObject *parent)
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
-    _messageModel(0),
     _ircListHelper(new ClientIrcListHelper(this)),
+    _messageModel(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {
@@ -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.*)?$");
@@ -646,6 +648,7 @@ void Client::bufferRemoved(BufferId bufferId) {
   Buffer *buff = 0;
   if(_buffers.contains(bufferId)) {
     buff = _buffers.take(bufferId);
+    layoutQueue.removeAll(buff);
     disconnect(buff, 0, this, 0);
   }