fix settings not loading if no calendar.days.json file exists

espruino · Oct 19, 2023 · 503516e · 503516e
1 parent 9da07b3
commit 503516e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/apps/calendar/settings.js b/apps/calendar/settings.js
@@ -1,14 +1,14 @@
 (function (back) {
   var FILE = "calendar.json";
   const HOLIDAY_FILE = "calendar.days.json";
-  var settings = require('Storage').readJSON(FILE, true) || {};
+  var settings = require('Storage').readJSON(FILE, 1) || {};
   if (settings.ndColors === undefined)
     if (process.env.HWVERSION == 2) {
       settings.ndColors = true;
     } else {
       settings.ndColors = false;
     }
-  const holidays = require("Storage").readJSON(HOLIDAY_FILE,1).sort((a,b) => new Date(a.date) - new Date(b.date)) || [];
+  const holidays = (require("Storage").readJSON(HOLIDAY_FILE,1)||[]).sort((a,b) => new Date(a.date) - new Date(b.date)) || [];
 
   function writeSettings() {
     require('Storage').writeJSON(FILE, settings);