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

src/blackcore/context_application_proxy.cpp

@@ -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)

src/blackmisc/identifier.cpp

@@ -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());

src/blackmisc/identifier.h

@@ -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; }