Implement client UI integration, add feature flag (0x400)

[quassel.git] / src / uisupport / abstractbuffercontainer.cpp

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index 5c01603..ca9c101 100644 (file)
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -126,7 +126,9 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId)
 
     _currentBuffer = bufferId;
     showChatView(bufferId);
-    Client::networkModel()->clearBufferActivity(bufferId);
+    if (!Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        Client::networkModel()->clearBufferActivity(bufferId);
+    }
     Client::setBufferLastSeenMsg(bufferId, _chatViews[bufferId]->lastMsgId());
     Client::backlogManager()->checkForBacklog(bufferId);
     setFocus();