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

Merge branch 'master' into mediafoundation

Browse Source 
# Conflicts:
#	assets/webconfig/content/dashboard.html
#	assets/webconfig/i18n/en.json
#	assets/webconfig/js/content_dashboard.js
#	assets/webconfig/js/content_logging.js
#	assets/webconfig/js/hyperion.js
#	assets/webconfig/js/ui_utils.js
This commit is contained in:
LordGrey
2021-05-02 21:12:00 +02:00
parent 1514d8442d 03afc0db8f
commit 9ea40a873e
139 changed files with 9391 additions and 4785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hyperiond/hyperiond.cpp
View File

@@ -96,8 +96,8 @@ HyperionDaemon::HyperionDaemon(const QString& rootPath, QObject* parent, bool lo
qRegisterMetaType<QMap<quint8, QJsonObject>>("QMap<quint8,QJsonObject>");
qRegisterMetaType<std::vector<ColorRgb>>("std::vector<ColorRgb>");
// init settings
_settingsManager = new SettingsManager(0, this, readonlyMode);
// init settings, this settingsManager accesses global settings which are independent from instances
_settingsManager = new SettingsManager(GLOABL_INSTANCE_ID, this, readonlyMode);
// set inital log lvl if the loglvl wasn't overwritten by arg
if (!logLvlOverwrite)