From 6168782cf5c1335c149b99c4e29c06cab6c52a17 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 26 Jul 2021 15:53:46 +0100
Subject: [PATCH] bootloader 0.28: Fix double clock load after settings are
 changed

---
 apps.json               | 5 +----
 apps/boot/ChangeLog     | 1 +
 apps/boot/bootupdate.js | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps.json b/apps.json
index 2399b53c7..f4343600f 100644
--- a/apps.json
+++ b/apps.json
@@ -4,7 +4,7 @@
     "tags": "tool,system,b2",
     "type":"bootloader",
     "icon": "bootloader.png",
-    "version":"0.27",
+    "version":"0.28",
     "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
     "storage": [
       {"name":".boot0","url":"boot0.js"},
@@ -3371,6 +3371,3 @@
   ]
 }
 ]
-
-
-
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index ccf97a9eb..4a8c62d59 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -26,3 +26,4 @@
 0.25: Fix error in 'no clock app' message
 0.26: Remove buzz in setUI polyfill (#750)
 0.27: Update polyfill for most recent changes
+0.28: Fix double clock load after settings are changed
diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js
index 014edd552..4c4efed29 100644
--- a/apps/boot/bootupdate.js
+++ b/apps/boot/bootupdate.js
@@ -136,8 +136,9 @@ require('Storage').list(/\.boot\.js/).forEach(bootFile=>{
   boot += "//"+bootFile+"\n"+require('Storage').read(bootFile)+"\n";
 });
 boot += "}\n";// initial 'if'
-var s = require('Storage').write('.boot0',boot);
+require('Storage').write('.boot0',boot);
 delete boot;
 E.showMessage("Reloading...");
 eval(require('Storage').read('.boot0'));
-eval(require('Storage').read('.bootcde'));
+// .bootcde should be run automatically after if required, since
+// we normally get called automatically from '.boot0'