X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=edb7a319a68e7a319efe079aba79bce95e080b46;hb=fdf69d69f0dda76a65a27ce7059b7b86696ff79c;hp=c9c44d163f1bf5bd6c9cc49772e7b67ae73d35bc;hpb=aa5df1497a6fca61d6f59be49572799b5c9d93fe;p=quassel.git

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index c9c44d16..edb7a319 100644
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -46,6 +46,8 @@ MessageFilter::MessageFilter(MessageModel *source, const QList<BufferId> &buffer
 void MessageFilter::init() {
   setDynamicSortFilter(true);
 
+  _userNoticesTarget = _serverNoticesTarget = _errorMsgsTarget = -1;
+
   BufferSettings defaultSettings;
   defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionChanged()));
   defaultSettings.notify("ServerNoticesTarget", this, SLOT(messageRedirectionChanged()));
@@ -140,29 +142,26 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
   if(myNetworkId != msgNetworkId)
     return false;
 
-  bool redirect = false;
-  int redirectionTarget = 0;
-  switch(messageType) {
-  case Message::Notice:
-    if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
-      redirect = true;
-      if(flags & Message::ServerMsg) {
-	// server notice
-	redirectionTarget = _serverNoticesTarget;
-      } else {
-	redirectionTarget = _userNoticesTarget;
+
+  if(flags & Message::Redirected) {
+    int redirectionTarget = 0;
+    switch(messageType) {
+    case Message::Notice:
+      if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
+	if(flags & Message::ServerMsg) {
+	  // server notice
+	  redirectionTarget = _serverNoticesTarget;
+	} else {
+	  redirectionTarget = _userNoticesTarget;
+	}
       }
+      break;
+    case Message::Error:
+      redirectionTarget = _errorMsgsTarget;
+      break;
+    default:
+      break;
     }
-    break;
-  case Message::Error:
-    redirect = true;
-    redirectionTarget = _errorMsgsTarget;
-    break;
-  default:
-    break;
-  }
-
-  if(redirect) {
 
     if(redirectionTarget & BufferSettings::DefaultBuffer && _validBuffers.contains(bufferId))
       return true;