frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1131 - Global (Grabber) setting are not correctly read by non-default instances (#1186)

Browse Source
This commit is contained in:
LordGrey
2021-02-11 19:45:22 +01:00
committed by GitHub
parent ac88fdd80f
commit 77262adf3b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/hyperion/SettingsManager.cpp
View File

@@ -114,6 +114,17 @@ QJsonDocument SettingsManager::getSetting(settings::type type) const
return _sTable->getSettingsRecord(settings::typeToString(type));
}
QJsonObject SettingsManager::getSettings() const
{
QJsonObject config;
for(const auto & key : _qconfig.keys())
{
//Read all records from database to ensure that global settings are read across instances
config.insert(key, _sTable->getSettingsRecord(key).object());
}
return config;
}
bool SettingsManager::saveSettings(QJsonObject config, bool correct)
{
// optional data upgrades e.g. imported legacy/older configs