From 6cdf52e028dda9e1f7f5627e21e440e21815e3ab Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 16 Feb 2010 21:55:48 +0100 Subject: [PATCH] Properly set coreFeatures in the monolithic client --- src/client/coreconnection.cpp | 3 +++ src/core/coresession.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp index f5239140..3bd59e0b 100644 --- a/src/client/coreconnection.cpp +++ b/src/client/coreconnection.cpp @@ -635,6 +635,9 @@ void CoreConnection::internalSessionStateReceived(const QVariant &packedState) { } void CoreConnection::syncToCore(const QVariantMap &sessionState) { + if(sessionState.contains("CoreFeatures")) + Client::setCoreFeatures((Quassel::Features)sessionState["CoreFeatures"].toUInt()); + setProgressText(tr("Receiving network states")); updateProgress(0, 100); diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 355d867f..c515faed 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -293,6 +293,8 @@ void CoreSession::processMessages() { QVariant CoreSession::sessionState() { QVariantMap v; + v["CoreFeatures"] = (int)Quassel::features(); + QVariantList bufs; foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id); v["BufferInfos"] = bufs; -- 2.20.1