flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move settings loading into factory method, since read should not be called

Browse Source 
by DBus proxy.
This commit is contained in:
Roland Winklmeier
2014-06-15 20:24:40 +02:00
parent 8cbff262d1
commit 2e485a324c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context_runtime.cpp
View File

@@ -342,7 +342,6 @@ namespace BlackCore
// contexts // contexts
this->m_contextSettings = IContextSettings::create(this, config.getModeSettings(), this->m_dbusServer, this->m_dbusConnection); this->m_contextSettings = IContextSettings::create(this, config.getModeSettings(), this->m_dbusServer, this->m_dbusConnection);
this->m_contextSettings->read();
times.insert("Settings", time.restart()); times.insert("Settings", time.restart());
this->m_contextApplication = IContextApplication::create(this, config.getModeApplication(), this->m_dbusServer, this->m_dbusConnection); this->m_contextApplication = IContextApplication::create(this, config.getModeApplication(), this->m_dbusServer, this->m_dbusConnection);

7
src/blackcore/context_settings.cpp
View File

@@ -16,7 +16,12 @@ namespace BlackCore
{ {
case CRuntimeConfig::Local: case CRuntimeConfig::Local:
case CRuntimeConfig::LocalInDbusServer: case CRuntimeConfig::LocalInDbusServer:
return (new CContextSettings(mode, parent))->registerWithDBus(server); {
CContextSettings *contextSettings = new CContextSettings(mode, parent);
contextSettings->registerWithDBus(server);
contextSettings->read();
return contextSettings;
}
case CRuntimeConfig::Remote: case CRuntimeConfig::Remote:
return new BlackCore::CContextSettingsProxy(BlackCore::CDBusServer::ServiceName, conn, mode, parent); return new BlackCore::CContextSettingsProxy(BlackCore::CDBusServer::ServiceName, conn, mode, parent);
default: default: