From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 26 Aug 2009 10:56:46 +0000 (+0200)
Subject: Check for IgnoreListManager's existence before using it
X-Git-Tag: 0.5-rc1~3
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b6e6a7392b8c6f451baa7eaad472c978e19b3055

Check for IgnoreListManager's existence before using it

Fixes #775.
---

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index 2044b745..39fd3eb7 100644
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -145,8 +145,8 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
 
   // ignorelist handling
   // only match if message is not flagged as server msg
-  if(!(flags & Message::ServerMsg) &&
-      Client::ignoreListManager()->match(sourceIdx.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
+  if(!(flags & Message::ServerMsg) && Client::ignoreListManager()
+      && Client::ignoreListManager()->match(sourceIdx.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
     return false;
 
   if(flags & Message::Redirected) {
diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 0e4a2f93..b46dd29c 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -78,9 +78,9 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
 
   // ignorelist handling
   // only match if message is not flagged as server msg
-  if(!(flags & Message::ServerMsg) &&
-     Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
-      return false;
+  if(!(flags & Message::ServerMsg) && Client::ignoreListManager()
+      && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId)))
+    return false;
   return true;
 }
 
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 36e9825a..451bc240 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -957,8 +957,10 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
     if(hasFocus && bufId == _bufferWidget->currentBuffer())
       continue;
 
-    if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) &&
-       !Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufId))) {
+    if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer)
+      && !(Client::ignoreListManager() && Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value<Message>(),
+                                                                             Client::networkModel()->networkName(bufId))))
+    {
       QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
       QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
       QString contents = idx.data(ChatLineModel::DisplayRole).toString();