X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=0ccde8493b98ef8d376d824d83ad567f315d368d;hp=bac736b0c3c74eda9fb53f46c68d9bfb79d5b632;hb=4649188af29520951aa7485c577aa7ab912bef1a;hpb=d04fd0d39884932c5b9656ad3a4a6e13c204b529 diff --git a/src/client/client.cpp b/src/client/client.cpp index bac736b0..0ccde849 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -259,20 +259,17 @@ void Client::userInput(BufferInfo bufferInfo, QString message) { /*** core connection stuff ***/ -void Client::setConnectedToCore(QIODevice *socket, AccountId id) { - // if the socket is an orphan, the signalProxy adopts it. - // -> we don't need to care about it anymore - socket->setParent(0); - signalProxy()->addPeer(socket); +void Client::setConnectedToCore(AccountId id, QIODevice *socket) { + if(socket) { // external core + // if the socket is an orphan, the signalProxy adopts it. + // -> we don't need to care about it anymore + socket->setParent(0); + signalProxy()->addPeer(socket); + } _connectedToCore = true; setCurrentCoreAccount(id); } -void Client::setConnectedToInternalCore() { - _connectedToCore = true; - setCurrentCoreAccount(AccountId()); -} - void Client::setSyncedToCore() { // create buffersyncer Q_ASSERT(!_bufferSyncer);