Some cosmetic corrections and some minor work on the nick model. Hopefully I

[quassel.git] / src / core / coresession.cpp

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 28a074f..bf542c2 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -24,7 +24,6 @@
 #include "signalproxy.h"
 #include "storage.h"
 
-#include "synchronizer.h"
 #include "networkinfo.h"
 #include "ircuser.h"
 #include "ircchannel.h"
@@ -38,7 +37,7 @@ CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
     storage(_storage)
 {
-
+  
   QSettings s;
   s.beginGroup(QString("SessionData/%1").arg(user));
   mutex.lock();
@@ -52,7 +51,6 @@ CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
   p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
   p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
   p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString)));
-  p->attachSlot(SIGNAL(importOldBacklog()), storage, SLOT(importOldBacklog()));
   p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
   p->attachSignal(this, SIGNAL(displayMsg(Message)));
   p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
@@ -106,9 +104,9 @@ void CoreSession::connectToNetwork(QString network) {
   uint networkid = getNetworkId(network);
   if(!servers.contains(networkid)) {
     Server *server = new Server(userId(), networkid, network);
+    servers[networkid] = server;
     attachServer(server);
     server->start();
-    servers[networkid] = server;
   }
   emit connectToIrc(network);
 }
@@ -146,8 +144,9 @@ void CoreSession::serverConnected(uint networkid) {
 }
 
 void CoreSession::serverDisconnected(uint networkid) {
-  servers.remove(networkid);
-  delete servers[networkid];
+  Q_ASSERT(servers.contains(networkid));
+  servers.take(networkid)->deleteLater();
+  Q_ASSERT(!servers.contains(networkid));
 }
 
 void CoreSession::msgFromGui(BufferInfo bufid, QString msg) {