messagesoverlay - Fix trying to draw on empty queue
parent
1ddbb79913
commit
a6b92215fa
|
|
@ -166,7 +166,7 @@ let showMessage = function(ovr, msg) {
|
||||||
msg.new = false;
|
msg.new = false;
|
||||||
if (!buzzing){
|
if (!buzzing){
|
||||||
buzzing = true;
|
buzzing = true;
|
||||||
Bangle.buzz().then(()=>{setTimeout(()=>{buzzing = false;},2000)});
|
Bangle.buzz().then(()=>{setTimeout(()=>{buzzing = false;},2000);});
|
||||||
}
|
}
|
||||||
Bangle.setLCDPower(1);
|
Bangle.setLCDPower(1);
|
||||||
}
|
}
|
||||||
|
|
@ -304,7 +304,7 @@ let drawMessage = function(ovr, msg) {
|
||||||
r += Math.max(metrics.height, metrics.maxImageHeight);
|
r += Math.max(metrics.height, metrics.maxImageHeight);
|
||||||
});
|
});
|
||||||
return r;
|
return r;
|
||||||
}
|
};
|
||||||
|
|
||||||
ovr.setColor(ovr.theme.fg);
|
ovr.setColor(ovr.theme.fg);
|
||||||
ovr.setBgColor(ovr.theme.bg);
|
ovr.setBgColor(ovr.theme.bg);
|
||||||
|
|
@ -484,7 +484,9 @@ let updateClearingTimeout = ()=>{
|
||||||
LOG("Set new clearing timeout");
|
LOG("Set new clearing timeout");
|
||||||
clearingTimeout = setTimeout(()=>{
|
clearingTimeout = setTimeout(()=>{
|
||||||
LOG("setNewTimeout");
|
LOG("setNewTimeout");
|
||||||
drawMessage(ovr, eventQueue.pop());
|
let event = eventQueue.pop();
|
||||||
|
if (event)
|
||||||
|
drawMessage(ovr, event);
|
||||||
if (eventQueue.length > 0){
|
if (eventQueue.length > 0){
|
||||||
LOG("still got elements");
|
LOG("still got elements");
|
||||||
updateClearingTimeout();
|
updateClearingTimeout();
|
||||||
|
|
@ -498,7 +500,7 @@ let updateClearingTimeout = ()=>{
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.message = function(type, event) {
|
exports.message = function(type, event) {
|
||||||
LOG("Got message", type);
|
LOG("Got message", type, event);
|
||||||
// only handle some event types
|
// only handle some event types
|
||||||
if(!(type=="text" || type == "call")) return;
|
if(!(type=="text" || type == "call")) return;
|
||||||
if(type=="text" && event.id == "nav") return;
|
if(type=="text" && event.id == "nav") return;
|
||||||
|
|
@ -528,7 +530,6 @@ exports.message = function(type, event) {
|
||||||
ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
|
ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
|
||||||
|
|
||||||
ovr.clear();
|
ovr.clear();
|
||||||
|
|
||||||
main(ovr, event);
|
main(ovr, event);
|
||||||
|
|
||||||
updateClearingTimeout();
|
updateClearingTimeout();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue