-void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) {
- if(_lastSeenMsg.contains(buffer2))
- _lastSeenMsg.remove(buffer2);
- if(_markerLines.contains(buffer2))
- _markerLines.remove(buffer2);
- SYNC(ARG(buffer1), ARG(buffer2))
- emit buffersPermanentlyMerged(buffer1, buffer2);
+
+void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
+{
+ if (_lastSeenMsg.contains(buffer2))
+ _lastSeenMsg.remove(buffer2);
+ if (_markerLines.contains(buffer2))
+ _markerLines.remove(buffer2);
+ if (_bufferActivities.contains(buffer2))
+ _bufferActivities.remove(buffer2);
+ SYNC(ARG(buffer1), ARG(buffer2))
+ emit buffersPermanentlyMerged(buffer1, buffer2);