From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 21 May 2009 14:48:35 +0000 (+0200)
Subject: OverlayFilter no longer filters whole networks unnecessarily out
X-Git-Tag: 0.5-rc1~186
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e2204c43143e60b5e99f9247117a7c0099a3936d;hp=920643004f172d255dd2420d1b03adea3b3a07b2;ds=sidebyside

OverlayFilter no longer filters whole networks unnecessarily out
---

diff --git a/src/uisupport/bufferviewoverlayfilter.cpp b/src/uisupport/bufferviewoverlayfilter.cpp
index 97a3246e..992ab6c9 100644
--- a/src/uisupport/bufferviewoverlayfilter.cpp
+++ b/src/uisupport/bufferviewoverlayfilter.cpp
@@ -69,9 +69,15 @@ bool BufferViewOverlayFilter::filterAcceptsRow(int source_row, const QModelIndex
     return false;
   }
 
-  NetworkId networkId =  sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>();
-  if(!_overlay->networkIds().contains(networkId) && ! _overlay->allNetworks())
+  NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_bufferIndex, NetworkModel::ItemTypeRole).toInt();
+
+  NetworkId networkId = sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>();
+  if(!_overlay->networkIds().contains(networkId) && ! _overlay->allNetworks()) {
     return false;
+  } else if(itemType == NetworkModel::NetworkItemType) {
+    // network items don't need further checks.
+    return true;
+  }
 
   int activityLevel = sourceModel()->data(source_bufferIndex, NetworkModel::BufferActivityRole).toInt();
   if(_overlay->minimumActivity() > activityLevel)