flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #450 Last-minute fix for settings synchronization logic.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-12 13:03:26 +01:00
parent 51c97264f5
commit 08716705ca
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_application_proxy.cpp
View File

@@ -75,7 +75,7 @@ namespace BlackCore
void CContextApplicationProxy::synchronizeLocalSettings()
{
// note this proxy method does not call synchronizeLocalSettings in core
CSettingsCache::instance()->insertValues(this->getAllSettings());
CSettingsCache::instance()->changeValuesFromRemote(this->getAllSettings(), CIdentifier::anonymous());
}
BlackMisc::CStatusMessage CContextApplicationProxy::saveSettings(const QString &keyPrefix)

13
src/blackmisc/identifier.cpp
View File

@@ -22,6 +22,19 @@ namespace BlackMisc
m_processId(QCoreApplication::applicationPid())
{ }
CIdentifier CIdentifier::anonymous()
{
static CIdentifier id;
if (id.m_processId)
{
id.m_processId = 0;
id.m_processName = "";
id.m_machineName = "";
id.m_machineIdBase64 = "";
}
return id;
}
QByteArray CIdentifier::getMachineId() const
{
return QByteArray::fromBase64(m_machineIdBase64.toLocal8Bit());

3
src/blackmisc/identifier.h
View File

@@ -46,6 +46,9 @@ namespace BlackMisc
//! Constructor.
CIdentifier(const QString &name = QString());
//! Returns an anonymous identifier.
static CIdentifier anonymous();
//! Name
QString getName() const { return m_name; }