/***************************************************************************
- * Copyright (C) 2005-2019 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
{
+ setBufferActivity(buffer1, _bufferActivities[buffer1] | _bufferActivities[buffer2]);
+ setHighlightCount(buffer1, _highlightCounts[buffer1] + _highlightCounts[buffer2]);
+
if (_lastSeenMsg.contains(buffer2))
_lastSeenMsg.remove(buffer2);
if (_markerLines.contains(buffer2))