X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=daa338abedcc872ce9efc1ff3d6e1b7f84b91159;hb=a2d4978097260c8af1f51ade497071793db2a0c0;hp=e94cf55b252b255ba3a1ddec955a94a19da32db3;hpb=57c70d731905d863116709c8524104b762f4e756;p=quassel.git diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp index e94cf55b..daa338ab 100644 --- a/src/client/buffer.cpp +++ b/src/client/buffer.cpp @@ -54,6 +54,10 @@ void Buffer::appendMsg(const Message &msg) { } void Buffer::prependMsg(const Message &msg) { + // check for duplicate first + if(contents().count() > 0 && msg.msgId() >= contents().first()->msgId()) { + return; + } updateActivityLevel(msg); layoutQueue.append(msg); } @@ -74,10 +78,10 @@ void Buffer::setVisible(bool visible) { setLastSeen(layoutedMsgs.last()->timestamp()); } -void Buffer::setLastSeen(const QDateTime &seen) { +void Buffer::setLastSeen(const QDateTime &seen) { // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen(); if(!lastSeen().isValid() || seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen; _lastSeen = seen; - Client::bufferSyncer()->requestSetLastSeen(bufferInfo().bufferId(), seen); + Client::setBufferLastSeen(bufferInfo().bufferId(), seen); //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen(); setActivityLevel(NoActivity); }