projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buffersyncer state when merging buffers
[quassel.git]
/
src
/
common
/
buffersyncer.cpp
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)
{
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))
if (_lastSeenMsg.contains(buffer2))
_lastSeenMsg.remove(buffer2);
if (_markerLines.contains(buffer2))