From 85268b8f826e1920bc843b9ff3b99c806aeecd3e Mon Sep 17 00:00:00 2001
From: Alessandro Cocco <alessandrococco@users.noreply.github.com>
Date: Thu, 21 Apr 2022 11:15:49 +0200
Subject: [PATCH] [Alarms & Timers] Avoid time reset after a dow change

---
 apps/alarm/ChangeLog     | 1 +
 apps/alarm/app.js        | 6 +++++-
 apps/alarm/metadata.json | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index 3f56f4c20..906169a04 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -19,3 +19,4 @@
 0.18: Cope with >1 identical alarm at once (#1667)
 0.19: Ensure rescheduled alarms that already fired have 'last' reset
 0.20: Use the new 'sched' factories to initialize new alarms/timers
+0.21: Fix time reset after a day of week change (#1676)
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index 1fc32ecb9..e895f9041 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -119,7 +119,11 @@ function editAlarm(alarmIndex, alarm) {
     },
     /*LANG*/'Days': {
       value: "SMTWTFS".split("").map((d,n)=>a.dow&(1<<n)?d:".").join(""),
-      onchange: () => editDOW(a.dow, d=>{a.dow=d;editAlarm(alarmIndex,a)})
+      onchange: () => editDOW(a.dow, d => {
+        a.dow = d;
+        a.t = encodeTime(t);
+        editAlarm(alarmIndex, a);
+      })
     },
     /*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
     /*LANG*/'Auto Snooze': {
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index db36b3ca9..5c443dcec 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.20",
+  "version": "0.21",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm,widget",