Bangle_setUI_Q3: fix btn back handler was not always rm:ed correctly

Author: thyttan

libs/js/banglejs/Bangle_setUI_Q3.js

@@ -1,3 +1,4 @@
+Bangle.setUI = // Debugging delete before merge
 (function(mode, cb) {
   var options = {};
   if ("object"==typeof mode) {
@@ -10,10 +11,11 @@
     hadBackWidget = true; // if we had a back widget already, don't redraw at the end
     WIDGETS.back.remove(options.back); // only redraw when removing if we don't have options.back
   }
-  if (Bangle.btnWatches) {
+  let clearBtnWatches = function() {
     Bangle.btnWatches.forEach(clearWatch);
     delete Bangle.btnWatches;
   }
+  if (Bangle.btnWatches) clearBtnWatches();
   if (Bangle.swipeHandler) {
     Bangle.removeListener("swipe", Bangle.swipeHandler);
     delete Bangle.swipeHandler;
@@ -118,13 +120,15 @@
   if (options.redraw) // handler for redrawing the UI
     Bangle.uiRedraw = options.redraw;
   if (options.back) {
-    var btnWatch;
+    let isBtnBackFunc = false;
     // only add back button handler if there's no existing watch on BTN1
-    if (Bangle.btnWatches===undefined) 
-      btnWatch = setWatch(function() {
-        btnWatch = undefined;
+    if (Bangle.btnWatches===undefined) {
+      Bangle.btnWatches = [ setWatch(function() {
+        Bangle.btnWatches = undefined;
         options.back();
-      }, BTN1, {edge:"rising"});
+      }, BTN1, {edge:"rising"}) ];
+      isBtnBackFunc = true;
+    }
     // if we have widgets loaded *and* visible at the top, add a back widget (see #3788)
     if (global.WIDGETS && Bangle.appRect.y) {
       // add our own touch handler for touching in the top left
@@ -143,7 +147,7 @@
         remove:function(noclear){
           var w = WIDGETS.back;
           if (w.area!="tl") noclear=true; // area="" is set by widget_utils.hide, so avoid drawing
-          if (btnWatch) clearWatch(btnWatch);
+          if (isBtnBackFunc && Bangle.btnWatches) clearBtnWatches();
           Bangle.removeListener("touch", touchHandler);
           if (!noclear) g.reset().clearRect({x:w.x, y:w.y, w:24,h:24});
           delete WIDGETS.back;