X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=139f44b3c25b53909c740811f8eebc316e996662;hp=02c9a2037db1703779898005a3bf175a32a4634b;hb=4649188af29520951aa7485c577aa7ab912bef1a;hpb=d04fd0d39884932c5b9656ad3a4a6e13c204b529

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 02c9a203..139f44b3 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -169,7 +169,8 @@ void ClientSyncer::coreSocketConnected() {
   SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
-void ClientSyncer::useInternalCore() {
+void ClientSyncer::useInternalCore(AccountId internalAccountId) {
+  coreConnectionInfo["AccountId"] = QVariant::fromValue<AccountId>(internalAccountId);
   emit startInternalCore();
   emit connectToInternalCore(Client::instance()->signalProxy());
 }
@@ -248,7 +249,7 @@ void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
 void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
   QVariantMap state = packedState.toMap();
   emit sessionProgress(1, 1);
-  Client::instance()->setConnectedToInternalCore();
+  Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>());
   syncToCore(state);
 }
 
@@ -256,7 +257,7 @@ void ClientSyncer::sessionStateReceived(const QVariantMap &state) {
   emit sessionProgress(1, 1);
   disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));
   disconnect(socket, 0, this, 0);  // rest of communication happens through SignalProxy
-  Client::instance()->setConnectedToCore(socket, coreConnectionInfo["AccountId"].value<AccountId>());
+  Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>(), socket);
   syncToCore(state);
 }