From 81828d214b26e2d0803442fef3d435593650a6a4 Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Mon, 25 Feb 2019 20:16:40 +0000 Subject: [configloader] fix non-expert-mode not loading correctly --- server/api/configloader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/api/configloader.js') diff --git a/server/api/configloader.js b/server/api/configloader.js index bd231a5..2422693 100644 --- a/server/api/configloader.js +++ b/server/api/configloader.js @@ -108,7 +108,7 @@ function checkGroupsForConfigs (groupIds) { // create the config script from database function createIpxeScript (id) { return db.config.findOne({ where: { id: id }, include: ['entries'], order: [[['entries'], 'sortValue', 'ASC']] }).then(config => { - if (config.script !== null) { + if (config.script !== null && config.script !== '') { return config.script } var script = '' @@ -122,7 +122,7 @@ function createIpxeScript (id) { script += ' --key ' + entry.config_x_entry.keyBind } script += ' menuentry' + entry.id + ' ' - if (entry.config_x_entry.customName !== null) { + if (entry.config_x_entry.customName !== null && entry.config_x_entry.customName !== '') { script += entry.config_x_entry.customName } else { script += entry.name -- cgit v1.2.3-55-g7522