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

Ref T709, avoid pure virtual assert by removing the JSON ctor, which is calling a virtual function in the ctor

Browse Source
This commit is contained in:
Klaus Basan
2019-08-14 23:55:32 +02:00
committed by Mat Sutcliffe
parent 0b728053f0
commit 024360a5df
5 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/xswiftbus/service.cpp
View File

@@ -164,7 +164,8 @@ namespace XSwiftBus
void CService::setSettingsJson(const std::string &jsonString)
{
const CSettings s(jsonString);
CSettings s;
s.parseXSwiftBusString(jsonString);
this->setSettings(s);
INFO_LOG("Received settings " + s.convertToString());
}

5
src/xswiftbus/settings.cpp
View File

@@ -22,11 +22,6 @@ namespace XSwiftBus
// void
}
CSettings::CSettings(const std::string &json) : CXSwiftBusSettingsQtFree(json)
{
// void
}
CSettings CSettingsProvider::getSettings() const
{
std::lock_guard<std::mutex> l(m_settingsMutex);

3
src/xswiftbus/settings.h
View File

@@ -24,9 +24,6 @@ namespace XSwiftBus
//! Constructor.
CSettings();
//! JSON constructor
CSettings(const std::string &json);
protected:
//! \copydoc BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::objectUpdated
virtual void objectUpdated() override final {}