X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=228d4df3950371d25615d4675f89586490d12274;hb=02b4f33429788d35500454bfb5a8a9ab0a2a2b49;hp=b1b28ee2bde386437d3a3bf95102088b8ea807dc;hpb=925149e4675223754de4962b95728b76647d4949;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index b1b28ee2..228d4df3 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -328,7 +328,7 @@ void Client::setSyncedToCore() {
   // create a new BufferViewManager
   Q_ASSERT(!_bufferViewManager);
   _bufferViewManager = new ClientBufferViewManager(signalProxy(), this);
-  connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
+  connect(_bufferViewManager, SIGNAL(initDone()), _bufferViewOverlay, SLOT(restore()));
 
   // create AliasManager
   Q_ASSERT(!_aliasManager);
@@ -359,20 +359,14 @@ void Client::requestInitialBacklog() {
   // triggers this slot. But we have to make sure that we know all buffers yet.
   // so we check the BufferSyncer and in case it wasn't initialized we wait for that instead
   if(!bufferSyncer()->isInitialized()) {
-    connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+    disconnect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
     connect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
     return;
   }
-  _backlogManager->requestInitialBacklog();
-}
+  disconnect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+  disconnect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
 
-void Client::createDefaultBufferView() {
-  if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
-    BufferViewConfig config(-1);
-    config.setBufferViewName(tr("All Chats"));
-    config.initSetBufferList(networkModel()->allBufferIdsSorted());
-    bufferViewManager()->requestCreateBufferView(config.toVariantMap());
-  }
+  _backlogManager->requestInitialBacklog();
 }
 
 void Client::disconnectFromCore() {
@@ -404,6 +398,8 @@ void Client::setDisconnectedFromCore() {
     _bufferViewManager = 0;
   }
 
+  _bufferViewOverlay->reset();
+
   if(_aliasManager) {
     _aliasManager->deleteLater();
     _aliasManager = 0;