From 48d9367e2fdf1b303db39201c9661e99f6e247c9 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 21 Oct 2022 11:42:18 +0100
Subject: [PATCH] minor fixes for last commit, rename 'clockApp' to make name
 conflicts even less likely

---
 apps/boot/bootloader.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/boot/bootloader.js b/apps/boot/bootloader.js
index a20354e6d..1e0d22645 100644
--- a/apps/boot/bootloader.js
+++ b/apps/boot/bootloader.js
@@ -1,8 +1,8 @@
 // This runs after a 'fresh' boot
 var s = require("Storage").readJSON("setting.json",1)||{};
-var clockApp = require("Storage").read(s.clock);
-if (!clockApp) {
-  clockApp = require("Storage").list(/\.info$/)
+var _clkApp = require("Storage").read(s.clock);
+if (!_clkApp) {
+  _clkApp = require("Storage").list(/\.info$/)
     .map(file => {
       const app = require("Storage").readJSON(file,1);
       if (app && app.type == "clock") {
@@ -11,13 +11,13 @@ if (!clockApp) {
     })
     .filter(x=>x)
     .sort((a, b) => a.sortorder - b.sortorder)[0];
-  if (clockApp){
-    clockApp = require("Storage").read(clockApp.src);
-    s.clock = clockApp.src;
+  if (_clkApp){
+    s.clock = _clkApp.src;
+    _clkApp = require("Storage").read(_clkApp.src);    
     require("Storage").writeJSON("setting.json", s);
   }
 }
-if (!clockApp) clockApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
-eval(clockApp);
 delete s;
-delete clockApp;
+if (!_clkApp) _clkApp=`E.showMessage("No Clock Found");setWatch(()=>{Bangle.showLauncher();}, global.BTN2||BTN, {repeat:false,edge:"falling"});`;
+eval(_clkApp);
+delete _clkApp;