From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 30 May 2019 06:36:55 +0000 (+0200)
Subject: Fix buffersyncer state when merging buffers
X-Git-Tag: test-travis-01~6
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7168c6adaa3cd2be160aa1731c7444dc384a4a98

Fix buffersyncer state when merging buffers
---

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index c5e88f39..cbebd03a 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -158,6 +158,9 @@ void BufferSyncer::removeBuffer(BufferId buffer)
 
 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))