projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7125305
)
Fix buffersyncer state when merging buffers
author
Janne Koschinski
<janne@kuschku.de>
Thu, 30 May 2019 06:36:55 +0000
(08:36 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sun, 15 Mar 2020 16:26:24 +0000
(17:26 +0100)
src/common/buffersyncer.cpp
patch
|
blob
|
history
diff --git
a/src/common/buffersyncer.cpp
b/src/common/buffersyncer.cpp
index
c5e88f3
..
cbebd03
100644
(file)
--- 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))