X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=241e2e687ae8eeff26f7be1b0386b8aef1a79fae;hb=f8557ba65eb38ac4988bfbbb2c4ef579d4534cf0;hp=0cb9face2e35faf796b8c2b3cb21fedf296df4ed;hpb=613850196857c7e29b0ef5c09175aadb9492642d;p=quassel.git

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 0cb9face..241e2e68 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -65,7 +65,7 @@ void Buffer::prependMsg(const Message &msg) {
 bool Buffer::layoutMsg() {
   if(layoutQueue.isEmpty())
     return false;
-  
+
   AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
   layoutedMsgs.prepend(m);
   emit msgPrepended(m);
@@ -76,9 +76,11 @@ bool Buffer::layoutMsg() {
 void Buffer::setVisible(bool visible) {
   _isVisible = visible;
   setActivityLevel(NoActivity);
-  if(layoutedMsgs.isEmpty())
-    return;
-  setLastSeenMsg(layoutedMsgs.last()->msgId());
+  //if(layoutedMsgs.isEmpty())
+  //  return;
+  //setLastSeenMsg(layoutedMsgs.last()->msgId());
+  if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId());
+  //qDebug() << "setting last seen" << _lastRcvdMsg.msgId();
 }
 
 void Buffer::setLastSeenMsg(const MsgId &msgId) {
@@ -102,6 +104,10 @@ void Buffer::setActivityLevel(ActivityLevel level) {
 }
 
 void Buffer::updateActivityLevel(const Message &msg) {
+  // FIXME dirty hack to allow the lastSeen stuff to continue to work
+  //       will be made much nicer once Buffer dies, I hope...
+  if(msg.msgId() > _lastRcvdMsg.msgId()) _lastRcvdMsg = msg;
+
   if(isVisible())
     return;
 
@@ -114,7 +120,7 @@ void Buffer::updateActivityLevel(const Message &msg) {
   ActivityLevel level = activityLevel() | OtherActivity;
   if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
     level |= NewMessage;
-  
+
   if(msg.flags() & Message::Highlight)
     level |= Highlight;