Fix buffer preselection on reconnect

Removes restriction on valid buffers in AbstractBufferContainer to
be able to clear buffer selection.

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 398f0a8..68a5f8e 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -977,6 +977,11 @@ void MainWin::disconnectedFromCore() {
   }
 
   QtUiSettings s;
   }
 
   QtUiSettings s;

+  BufferId lastBufId = Client::bufferModel()->currentBuffer();
+  if(lastBufId.isValid()) {
+    s.setValue("LastUsedBufferId", lastBufId.toInt());
+    Client::bufferModel()->standardSelectionModel()->clearSelection();
+  }

   restoreState(s.value("MainWinState").toByteArray());
   setDisconnectedState();
 }
   restoreState(s.value("MainWinState").toByteArray());
   setDisconnectedState();
 }

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index 65377fe..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>();
   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);
     setCurrentBuffer(newBufferId);
     emit currentChanged(newBufferId);
     emit currentChanged(current);