X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.cpp;h=0adf8ebb53338cdfb672bb9625ceeec7c2fb839f;hp=5dcb7e8cd9cd876a692e5842dfbf1d2c354d059a;hb=d07c7f8e2de851adefcee45049bb1bb19682d0c6;hpb=72f1a93311815cc637358f52046a4cf311bbd9f4

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 5dcb7e8c..0adf8ebb 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -93,6 +93,7 @@ void BufferViewFilter::configInitialized() {
   connect(config(), SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(bufferMoved(const BufferId &, int)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(invalidate()));
+  connect(config(), SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(invalidate()));
 
   disconnect(config(), SIGNAL(initDone()), this, SLOT(configInitialized()));
 
@@ -101,7 +102,7 @@ void BufferViewFilter::configInitialized() {
 
 Qt::ItemFlags BufferViewFilter::flags(const QModelIndex &index) const {
   Qt::ItemFlags flags = mapToSource(index).flags();
-  if(_config && index == QModelIndex() || index.parent() == QModelIndex())
+  if(_config && (index == QModelIndex() || index.parent() == QModelIndex()))
     flags |= Qt::ItemIsDropEnabled;
   return flags;
 }
@@ -180,10 +181,10 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     // add the buffer if...
     if(config()->isInitialized() && !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
        && ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
-	   || activityLevel > Buffer::OtherActivity)) { // or was just temporarily hidden and has a new message waiting for us.
+	   || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > Buffer::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
       addBuffer(bufferId);
     }
-    // note: adding the buffer to the valid list does not temper with the filters ("show only channels" and stuff)
+    // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
     return false;
   }