From b7222c485b14cf7b7f4efefd7b7cdee6f3e46602 Mon Sep 17 00:00:00 2001
From: lunctis-viribus <josdaboss@gmail.com>
Date: Sun, 26 Feb 2023 16:46:02 +0100
Subject: [PATCH] weatherclock v0.06

---
 apps/weatherClock/ChangeLog   |  2 +-
 apps/weatherClock/settings.js | 20 ++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/apps/weatherClock/ChangeLog b/apps/weatherClock/ChangeLog
index c2c0b76e3..37891568d 100644
--- a/apps/weatherClock/ChangeLog
+++ b/apps/weatherClock/ChangeLog
@@ -3,4 +3,4 @@
 0.03: Minor layout extra spaces.
 0.04: Layout now compatible with Bangle.js 2.
 0.05: Use weather condition code for icon selection.
-0.06: Dev8-New settings to hide the weather icon, day of week, date and/or wind speed.
+0.06: Dev9-New settings to hide the weather icon, day of week, date and/or wind speed.
diff --git a/apps/weatherClock/settings.js b/apps/weatherClock/settings.js
index ee68df4fd..f8925d86a 100644
--- a/apps/weatherClock/settings.js
+++ b/apps/weatherClock/settings.js
@@ -1,22 +1,14 @@
 (function(back) {
   const SETTINGS_FILE = "weatherClock.json";
 
-  // initialize with default settings...
-  let s = {
-	'icon': true,
-    'day': true,
-    'date': true,
-    'wind': true
-  }
-
-  // ...and overwrite them with any saved values
-  // This way saved values are preserved if a new version adds more settings
+  // Load setings file
   const storage = require('Storage')
   let settings = storage.readJSON(SETTINGS_FILE, 1) || {}
-  const saved = settings || {}
-  for (const key in saved) {
-    s[key] = saved[key]
-  }
+  let s;
+  s.icon = (settings.icon === undefined ? true : settings.icon);
+  s.day = (settings.day === undefined ? true : settings.day);
+  s.date = (settings.date === undefined ? true : settings.date);
+  s.wind = (settings.wind === undefined ? true : settings.wind);
 
   function save() {
     settings = s