Trying to fix random segfault upon connect...

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

diff --git a/src/core/server.cpp b/src/core/server.cpp
index 92fe804..6bccd56 100644 (file)
--- a/src/core/server.cpp
+++ b/src/core/server.cpp
@@ -24,6 +24,8 @@
 #include <QDateTime>
 
 #include "util.h"
+#include "core.h"
+#include "coresession.h"
 
 Server::Server(UserId uid, QString net) : user(uid), network(net) {
   QString MQUOTE = QString('\020');
@@ -36,10 +38,12 @@ Server::Server(UserId uid, QString net) : user(uid), network(net) {
   QString XQUOTE = QString('\134');
   ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
   ctcpXDelimDequoteHash[XQUOTE + QString('a')] = XDELIM;
+  
+  serverinfo = new ServerInfo();
 }
 
 Server::~Server() {
-
+  delete serverinfo;
 }
 
 void Server::run() {
@@ -66,8 +70,11 @@ void Server::sendState() {
 
 void Server::connectToIrc(QString net) {
   if(net != network) return; // not me!
-  networkSettings = Global::data(user, "Networks").toMap()[net].toMap();
-  identity = Global::data(user, "Identities").toMap()[networkSettings["Identity"].toString()].toMap();
+  CoreSession *sess = Core::session(user);
+  //networkSettings = Global::data(user, "Networks").toMap()[net].toMap();
+  networkSettings = sess->retrieveSessionData("Networks").toMap()[net].toMap();
+  //identity = Global::data(user, "Identities").toMap()[networkSettings["Identity"].toString()].toMap();
+  identity = sess->retrieveSessionData("Identities").toMap()[networkSettings["Identity"].toString()].toMap();
   QList<QVariant> servers = networkSettings["Servers"].toList();
   QString host = servers[0].toMap()["Address"].toString();
   quint16 port = servers[0].toMap()["Port"].toUInt();