Corrections

libsrc/hyperion/AuthManager.cpp

@@ -7,6 +7,8 @@
 // qt
 #include <QJsonObject>
 #include <QTimer>
+#include <QDateTime>
+#include <QUuid>
 
 AuthManager *AuthManager::manager = nullptr;
 
@@ -14,7 +16,6 @@ AuthManager::AuthManager(QObject *parent)
 	: QObject(parent)
 	, _authTable(new AuthTable(this))
 	, _metaTable(new MetaTable(this))
-	, _pendingRequests()
 	, _timer(new QTimer(this))
 	, _authBlockTimer(new QTimer(this))
 {

libsrc/hyperion/Hyperion.cpp

@@ -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);
 }
 

libsrc/hyperion/SettingsManager.cpp

@@ -240,9 +240,6 @@ QJsonObject SettingsManager::getSettings(const QVariant& instance, const QString
 					config = jsonDoc.object();
 				}
 				settingsObject.insert(type, config);
-			} else
-			{
-				qWarning() << "Failed to parse JSON string:" << configObject;
 			}
 		}
 	}

libsrc/hyperion/schema/schema-grabberV4L2.json

@@ -24,6 +24,7 @@
 		"device": {
 			"type": "string",
 			"title": "edt_conf_enum_custom",
+			"default": "none",
 			"options": {
 				"hidden": true
 			},