Merge pull request #3319 from atjn/launch-warn-2

`launch` Fix broken reset

apps/launch/ChangeLog

@@ -20,3 +20,4 @@
 0.18: Add 'back' icon in top-left to go back to clock
 0.19: Fix regression after back button added (returnToClock was called twice!)
 0.20: Use Bangle.showClock for changing to clock
+0.21: Make the "App source not found" warning less buggy

apps/launch/app.js

@@ -42,7 +42,8 @@ let apps = launchCache.apps;
 if (!settings.fullscreen)
   Bangle.loadWidgets();
 
-E.showScroller({
+const drawMenu = () => {
+  E.showScroller({
     h : 64*scaleval, c : apps.length,
     draw : (i, r) => {
       var app = apps[i];
@@ -58,6 +59,7 @@ E.showScroller({
       var app = apps[i];
       if (!app) return;
       if (!app.src || require("Storage").read(app.src)===undefined) {
+        E.showScroller();
         E.showMessage(/*LANG*/"App Source\nNot found");
         setTimeout(drawMenu, 2000);
       } else {
@@ -70,19 +72,22 @@ E.showScroller({
       if (lockTimeout) clearTimeout(lockTimeout);
       Bangle.removeListener("lock", lockHandler);
     }
-});
-g.flip(); // force a render before widgets have finished drawing
+  });
+  g.flip(); // force a render before widgets have finished drawing
 
-// 10s of inactivity goes back to clock
-Bangle.setLocked(false); // unlock initially
-let lockTimeout;
-let lockHandler = function(locked) {
+  // 10s of inactivity goes back to clock
+  Bangle.setLocked(false); // unlock initially
+  let lockTimeout;
+  let lockHandler = function(locked) {
     if (lockTimeout) clearTimeout(lockTimeout);
     lockTimeout = undefined;
     if (locked)
       lockTimeout = setTimeout(Bangle.showClock, 10000);
-}
-Bangle.on("lock", lockHandler);
+  }
+  Bangle.on("lock", lockHandler);
+};
+drawMenu();
+
 if (!settings.fullscreen) // finally draw widgets
   Bangle.drawWidgets();
 }

apps/launch/metadata.json

@@ -2,7 +2,7 @@
   "id": "launch",
   "name": "Launcher",
   "shortName": "Launcher",
-  "version": "0.20",
+  "version": "0.21",
   "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
   "readme": "README.md",
   "icon": "app.png",

apps/lint_exemptions.js

@@ -996,12 +996,6 @@ module.exports = {
       "no-undef"
     ]
   },
-  "launch/app.js": {
-    "hash": "7d5b7d7f2adbe4c8c137f76b6560a06437ab142cfeffb3f0ff261f1250a6b687",
-    "rules": [
-      "no-undef"
-    ]
-  },
   "kitchen/stepo2.kit.js": {
     "hash": "b7660bef1a2560f23ff696b03d297cdd39936ca61c01b3d0a316d49f9cf72590",
     "rules": [