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

Corrections

Browse Source
This commit is contained in:
LordGrey
2024-08-02 00:23:36 +02:00
parent a8b2dd4d6a
commit 242d4aa391
8 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/hyperion/Hyperion.cpp
View File

@@ -6,6 +6,7 @@
#include <QString>
#include <QStringList>
#include <QThread>
#include <QVariantMap>
// hyperion include
#include <hyperion/Hyperion.h>
@@ -325,8 +326,9 @@ QJsonObject Hyperion::getQJsonConfig() const
const QJsonObject instanceConfig = _settingsManager->getSettings();
const QJsonObject globalConfig = _settingsManager->getSettings({},QStringList());
QVariantMap map = instanceConfig.toVariantMap();
map.insert(globalConfig.toVariantMap());
QMultiMap map = instanceConfig.toVariantMap();
map.unite(globalConfig.toVariantMap());
return QJsonObject::fromVariantMap(map);
}