X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=69ffbfc787396f59d9267e27ae7fd97123e16d09;hp=865855ec6dc738f17cfc3931528ceb5cec2e4978;hb=278aef059d7652b2a4e1359d72bb4028524246d4;hpb=682c6e31834a863c4c78b6dfd5f830c72a6b665d diff --git a/src/client/client.cpp b/src/client/client.cpp index 865855ec..69ffbfc7 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -429,6 +429,8 @@ void Client::recvMessage(const Message &message) { checkForHighlight(msg); + // FIXME clean up code! (dup) + if(msg.flags() & Message::Redirected) { BufferSettings bufferSettings; bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool(); @@ -438,22 +440,21 @@ void Client::recvMessage(const Message &message) { if(inStatus) { b = statusBuffer(msg.bufferInfo().networkId()); if(b) { - b->appendMsg(msg); + b->appendMsg(msg); } else if(!inQuery && !inCurrent) { // make sure the message get's shown somewhere - b = buffer(msg.bufferInfo()); - b->appendMsg(msg); + b = buffer(msg.bufferInfo()); + b->appendMsg(msg); } } if(inQuery) { b = buffer(msg.bufferInfo().bufferId()); if(b) { - b->appendMsg(msg); - } else if(!inStatus && !inCurrent) { // make sure the message get's shown somewhere - b = statusBuffer(msg.bufferInfo().networkId()); - if(!b) - b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... - b->appendMsg(msg); + b->appendMsg(msg); + } else if(!inStatus && !inCurrent) { // make sure the message get's shown somewhere + b = statusBuffer(msg.bufferInfo().networkId()); + if(!b) b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... + b->appendMsg(msg); } } @@ -461,12 +462,11 @@ void Client::recvMessage(const Message &message) { BufferId currentId = bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); b = buffer(currentId); if(b && currentId != msg.bufferInfo().bufferId() && !inQuery) { - b->appendMsg(msg); + b->appendMsg(msg); } else if(!inStatus && !inQuery) { // make sure the message get's shown somewhere - b = statusBuffer(msg.bufferInfo().networkId()); - if(!b) - b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... - b->appendMsg(msg); + b = statusBuffer(msg.bufferInfo().networkId()); + if(!b) b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... + b->appendMsg(msg); } } } else {