X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=9ddb6f0040504e16b8bd6ba88eba080be92dc7b5;hp=58a053aa30d9c9e2f35ef8c43c53f743233d0a9e;hb=ba0af203750f947255e5637ccee5e066effd8ac2;hpb=43e72e1cdba9451c58d322bf638e3bf761be71ac

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 58a053aa..9ddb6f00 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -144,9 +144,11 @@ void BufferViewFilter::removeBuffer(const QModelIndex &index) {
 
 
 bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
+  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+  Q_ASSERT(bufferId.isValid());
   if(!_config)
     return true;
-
+  
   if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
 
@@ -157,11 +159,10 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     return false;
 
   if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
-    if(!Client::bufferModel()->standardSelectionModel()->isSelected(source_bufferIndex))
+    if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
       return false;
   }
 
-  BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
   return _config->bufferList().contains(bufferId);
 }
 
@@ -184,7 +185,7 @@ bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc
     return false;
   }
 
-  if(source_parent == QModelIndex())
+  if(!source_parent.isValid())
     return filterAcceptNetwork(child);
   else
     return filterAcceptBuffer(child);
@@ -253,7 +254,7 @@ QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
 }
 
 void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
-  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
+  if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
     return;
 
   if(!config() || !config()->addNewBuffersAutomatically())