diff --git a/assets/webconfig/js/content_grabber.js b/assets/webconfig/js/content_grabber.js index 329c6c55..de0eb266 100755 --- a/assets/webconfig/js/content_grabber.js +++ b/assets/webconfig/js/content_grabber.js @@ -84,20 +84,18 @@ $(document).ready(function () { } } - if (key != 'device_inputs' || enumVals.length > 0) { - window.schema.grabberV4L2.properties[key] = { - "type": schema[key].type, - "title": schema[key].title, - ...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}), - // "enum": [].concat(["auto"], enumVals, ["custom"]), - "options": - { - "enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]), - }, - "propertyOrder": schema[key].propertyOrder, - "required": schema[key].required - }; - } + window.schema.grabberV4L2.properties[key] = { + "type": schema[key].type, + "title": schema[key].title, + ...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}), + // "enum": [].concat(["auto"], enumVals, ["custom"]), + "options": + { + "enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]), + }, + "propertyOrder": schema[key].propertyOrder, + "required": schema[key].required + }; } }; diff --git a/src/hyperiond/systray.cpp b/src/hyperiond/systray.cpp index fb3c973f..a1891e84 100644 --- a/src/hyperiond/systray.cpp +++ b/src/hyperiond/systray.cpp @@ -93,7 +93,6 @@ void SysTray::createTrayIcon() { if (efx.file.mid(0, 1) != ":") { - qDebug() << efx.file; QAction *efxAction = new QAction(efx.name, this); connect(efxAction, SIGNAL(triggered()), this, SLOT(setEffect())); _trayIconEfxMenu->addAction(efxAction);