From da5d020b0b8a29477261ee46013b7785ffabfee5 Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Sat, 23 Sep 2017 00:37:37 +0200 Subject: [PATCH] Correctly remove buffers from the buffersyncer I had forgotten to also remove buffers from the bufferactivity list when they are being removed. This is now fixed. --- src/common/buffersyncer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp index 27ded35e..310dfa69 100644 --- a/src/common/buffersyncer.cpp +++ b/src/common/buffersyncer.cpp @@ -160,6 +160,8 @@ void BufferSyncer::removeBuffer(BufferId buffer) _lastSeenMsg.remove(buffer); if (_markerLines.contains(buffer)) _markerLines.remove(buffer); + if (_bufferActivities.contains(buffer)) + _bufferActivities.remove(buffer); SYNC(ARG(buffer)) emit bufferRemoved(buffer); } @@ -171,6 +173,8 @@ void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId 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); } -- 2.20.1