From 3dad58f289bb74166ae45e24aae8db8bffafa7f5 Mon Sep 17 00:00:00 2001 From: ps-igel <60899838+ps-igel@users.noreply.github.com> Date: Mon, 4 May 2020 00:32:29 +0200 Subject: [PATCH] numerals clock: fixed settings issue --- apps.json | 2 +- apps/numerals/ChangeLog | 1 + apps/numerals/numerals.settings.js | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps.json b/apps.json index e9e38a1a1..62ea389f6 100644 --- a/apps.json +++ b/apps.json @@ -1283,7 +1283,7 @@ "name": "Numerals Clock", "shortName": "Numerals Clock", "icon": "numerals.png", - "version":"0.04", + "version":"0.05", "description": "A simple big numerals clock", "tags": "numerals,clock", "type":"clock", diff --git a/apps/numerals/ChangeLog b/apps/numerals/ChangeLog index 927c4ff5f..855442377 100644 --- a/apps/numerals/ChangeLog +++ b/apps/numerals/ChangeLog @@ -2,3 +2,4 @@ 0.02: Use BTN2 for settings menu like other clocks 0.03: maximize numerals, make menu button configurable, change icon to mac palette, add default settings file, respect 12hour setting 0.04: Don't overwrite existing settings on app update +0.05: Fix settings issue diff --git a/apps/numerals/numerals.settings.js b/apps/numerals/numerals.settings.js index 2d388525c..1e97271b6 100644 --- a/apps/numerals/numerals.settings.js +++ b/apps/numerals/numerals.settings.js @@ -11,7 +11,8 @@ updateSettings(); } let numeralsSettings = storage.readJSON('numerals.json',1); - if (!numeralsSettings) resetSettings(); + if (!numeralsSettings) resetSettings(); + if (numeralsSettings.menuButton===undefined) numeralsSettings.menuButton=22; let dm = ["fill","frame"]; let col = ["rnd","r/g","y/w","o/c","b/y"]; let btn = [[24,"BTN1"],[22,"BTN2"],[23,"BTN3"],[11,"BTN4"],[16,"BTN5"]]; @@ -30,7 +31,7 @@ onchange: v=> { numeralsSettings.drawMode=dm[v]; updateSettings();} }, "Menu button": { - value: 1|btn[numeralsSettings.menuButton], + value: btn.findIndex(e=>e[0]==numeralsSettings.menuButton), min:0,max:4, format: v=>btn[v][1], onchange: v=> { numeralsSettings.menuButton=btn[v][0]; updateSettings();}