X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=1f8306d636f235f9dae47839aed8caafd3830e76;hp=0558a7e968ef5c9101c97f2ef017a56694063c79;hb=7fccb74ec00f505d3a5485ad9592c37248c1e8c6;hpb=d8472f2ce2883b57af1771efbc21972e3cabc928

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 0558a7e9..1f8306d6 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -293,7 +293,12 @@ void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level)
 
 void BufferItem::clearActivityLevel()
 {
-    _activity = BufferInfo::NoActivity;
+    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        // If the core handles activity sync, clear only the highlight flag
+        _activity &= ~BufferInfo::Highlight;
+    } else {
+        _activity = BufferInfo::NoActivity;
+    }
     _firstUnreadMsgId = MsgId();
 
     // FIXME remove with core proto v11