From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 22 Sep 2017 22:37:37 +0000 (+0200)
Subject: Correctly remove buffers from the buffersyncer
X-Git-Tag: travis-deploy-test~238
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=da5d020b0b8a29477261ee46013b7785ffabfee5

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.
---

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);
 }