diff --git a/apps/boot/bootloader.js b/apps/boot/bootloader.js index 018b31011..c69bb74e6 100644 --- a/apps/boot/bootloader.js +++ b/apps/boot/bootloader.js @@ -2,10 +2,10 @@ var settings=require("Storage").readJSON('setting.json',1)||{}; // load clock if specified var clockApp = settings.clock; -if (clockApp) clockApp = require("Storage").read(clockApp) +if (clockApp) clockApp = require("Storage").read(clockApp); if (!clockApp) { var clockApps = require("Storage").list(/\.info$/).map(app=>require("Storage").readJSON(app,1)||{}).filter(app=>app.type=="clock").sort((a, b) => a.sortorder - b.sortorder); - if (clockApps && clockApps.length > 0) + if (clockApps && clockApps.length) clockApp = require("Storage").read(clockApps[0].src); delete clockApps; } @@ -24,7 +24,8 @@ if ((new Date()).getFullYear()<2000) { if (!g.time || (g.time.getFullYear()<2000) || (g.time.getFullYear()>2200)) { // GPS receiver's time not set - just boot clock anyway - eval(clockApp);delete clockApp; + eval(clockApp); + delete clockApp; return; } // We have a GPS time. Set time and reboot (to load alarms properly)