projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
709d88e
)
fixing a crash in certain custom views
author
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 3 Nov 2008 11:34:33 +0000
(12:34 +0100)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 3 Nov 2008 11:34:33 +0000
(12:34 +0100)
src/uisupport/bufferviewfilter.cpp
patch
|
blob
|
history
diff --git
a/src/uisupport/bufferviewfilter.cpp
b/src/uisupport/bufferviewfilter.cpp
index
5727d34
..
687cd80
100644
(file)
--- a/
src/uisupport/bufferviewfilter.cpp
+++ b/
src/uisupport/bufferviewfilter.cpp
@@
-216,13
+216,15
@@
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
return false;
if(!(config()->allowedBufferTypes() & (BufferInfo::Type)source_bufferIndex.data(NetworkModel::BufferTypeRole).toInt()))
return false;
+ // the following dynamic filters may not trigger if the buffer is currently selected.
+ if(bufferId == Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
+ return true;
+
if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
return false;
if(config()->hideInactiveBuffers() && !source_bufferIndex.data(NetworkModel::ItemActiveRole).toBool() && activityLevel <= BufferInfo::OtherActivity)
return false;
- if(config()->minimumActivity() > activityLevel) {
- if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
- return false;
- }
+ if(config()->minimumActivity() > activityLevel)
+ return false;
return true;
}
return true;
}