X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=7b57661859a8da3460eea5fa8b9e92c942eb4832;hp=5159f93a449f3e3c52b0eec6f327844e8bc45198;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=ec9528b2997470953e3c4e456271e696026e9717 diff --git a/src/core/core.cpp b/src/core/core.cpp index 5159f93a..7b576618 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -25,7 +25,7 @@ Core *Core::instanceptr = 0; -Core * Core::instance() { +Core *Core::instance() { if(instanceptr) return instanceptr; instanceptr = new Core(); instanceptr->init(); @@ -38,7 +38,6 @@ void Core::destroy() { } Core::Core() { - } void Core::init() { @@ -121,7 +120,7 @@ void Core::clientHasData() { return; } } - blockSizes[socket] = bsize = 0; // FIXME blockSizes aufräum0rn! + blockSizes[socket] = bsize = 0; // FIXME blockSizes aufräum0rn! } // FIXME: no longer called, since connection handling is now in SignalProxy @@ -163,10 +162,10 @@ void Core::processClientInit(QTcpSocket *socket, const QVariant &v) { QVariant Core::initSession(UserId uid) { // Find or create session for validated user CoreSession *sess; - if(sessions.contains(uid)) sess = sessions[uid]; - else { + if(sessions.contains(uid)) + sess = sessions[uid]; + else sess = createSession(uid); - } QVariantMap reply; reply["SessionState"] = sess->sessionState(); return reply;