FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

make boot menu more resilient to bad app data

pull/5/head
Gordon Williams 2019-11-07 08:43:08 +00:00
parent 67ee321185
commit 567d124a6a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/bootloader.js
View File

@ -8,7 +8,10 @@ setWatch(function() {
Bangle.removeAllListeners(); Bangle.removeAllListeners();
var s = require("Storage"); var s = require("Storage");
var apps = s.list().filter(a=>a[0]=='+').map(app=>s.readJSON(app)); apps = s.list().filter(a=>a[0]=='+').map(app=>{
try { return s.readJSON(app); }
catch (e) { return {name:"DEAD: "+app.substr(1)} }
});
var selected = 0; var selected = 0;
var menuScroll = 0; var menuScroll = 0;
var menuShowing = false; var menuShowing = false;
@ -34,8 +37,10 @@ setWatch(function() {
g.drawRect(0,y,239,y+63); g.drawRect(0,y,239,y+63);
} else } else
g.clearRect(0,y,239,y+63); g.clearRect(0,y,239,y+63);
if (app.icon) g.drawImage(s.read(app.icon),8,y+8);
g.drawString(app.name,64,y+32); g.drawString(app.name,64,y+32);
var icon=undefined;
if (app.icon) icon = s.read(app.icon);
if (icon) try {g.drawImage(icon,8,y+8);} catch(e){}
} }
} }
drawMenu(); drawMenu();
@ -52,6 +57,7 @@ setWatch(function() {
} }
}, BTN3, {repeat:true}); }, BTN3, {repeat:true});
setWatch(function() { // run setWatch(function() { // run
if (!apps[selected].src) return;
clearWatch(); clearWatch();
g.clear(); g.clear();
g.setFont("6x8",2); g.setFont("6x8",2);