Fix buffer preselection on reconnect

[quassel.git] / src / uisupport / abstractbuffercontainer.cpp

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index 4691c94..5ab79aa 100644 (file)
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -85,7 +85,8 @@ void AbstractBufferContainer::currentChanged(const QModelIndex &current, const Q
   Q_UNUSED(previous)
 
   BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
-  if(newBufferId.isValid() && currentBuffer() != newBufferId) {
+  // To be able to reset the selected buffer, we don't check if buffer/index is valid here
+  if(currentBuffer() != newBufferId) {
     setCurrentBuffer(newBufferId);
     emit currentChanged(newBufferId);
     emit currentChanged(current);
@@ -97,8 +98,6 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
   if(prevBufferId.isValid() && _chatViews.contains(prevBufferId)) {
     MsgId msgId = _chatViews.value(prevBufferId)->lastMsgId();
     Client::setBufferLastSeenMsg(prevBufferId, msgId);
-    if(autoSetMarkerLine())
-      Client::setBufferMarkerLine(prevBufferId, msgId);
   }
 
   if(!bufferId.isValid()) {