Skip to content

Commit dadcf1c

Browse files
author
thyttan
committed
messagegui: fix logic re unread timeout
by scoping the persist variable better
1 parent 3f4e75e commit dadcf1c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

apps/messagegui/app.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ if (Graphics.prototype.setFontIntl) {
4848
var active; // active screen (undefined/"list"/"music"/"map"/"overview"/"scroller"/"settings")
4949
var openMusic = false; // go back to music screen after we handle something else?
5050
var replying = false; // If we're replying to a message, don't interrupt
51+
var persist = "messagegui.new.js"!==global.__FILE__;
52+
5153
// hack for 2v10 firmware's lack of ':size' font handling
5254
try {
5355
g.setFont("6x8:2");
@@ -90,7 +92,6 @@ var onMessagesModified = function(type,msg) {
9092
}
9193
if (msg && msg.id=="nav" && msg.t=="modify" && active!="map")
9294
return; // don't show an updated nav message if we're just in the menu
93-
let persist = "messagegui.new.js"===global.__FILE__?false:true;
9495
showMessageRouter(msg, persist, "dependsOnActive");
9596
};
9697
Bangle.on("message", onMessagesModified);
@@ -625,7 +626,7 @@ function checkMessages(options) {
625626
// If we have a new message, show it
626627
if (!options.ignoreUnread && newMessages.length) {
627628
delete newMessages[0].show; // stop us getting stuck here if we're called a second time
628-
showMessagesScroller(newMessages[0], false);
629+
showMessagesScroller(newMessages[0], persist);
629630
// buzz after showMessagesScroller, so being busy during scroller setup doesn't affect the buzz pattern
630631
if (global.BUZZ_ON_NEW_MESSAGE) {
631632
// this is set if we entered the messages app by loading `messagegui.new.js`
@@ -742,6 +743,6 @@ Bangle.on('lock',locked => {
742743
cancelReloadTimeout();
743744
}
744745
if (locked) {
745-
if ("messagegui.new.js"===global.__FILE__) {resetReloadTimeout();}
746+
if (!persist) {resetReloadTimeout();}
746747
}
747748
});

0 commit comments

Comments
 (0)