From 192ba32a5d9fa0d04daa6a2d017ce70770f7a367 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Thu, 28 May 2020 22:32:53 +0200
Subject: [PATCH] simpletimer: make BTN2 really return to launcher

(only while countdown is not running)
---
 apps/simpletimer/README.md |  1 +
 apps/simpletimer/app.js    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/simpletimer/README.md b/apps/simpletimer/README.md
index ebe54dbe5..426942034 100644
--- a/apps/simpletimer/README.md
+++ b/apps/simpletimer/README.md
@@ -15,4 +15,5 @@ Simple timer, useful when playing board games or cooking
 - Tap on seconds to increase them one by one
 - Press BTN3 to reset time to 0
 - Press BTN1 to start the timer or reset to the original time
+- Press BTN2 to return to the launcher (only while countdown is not running)
 - When the time is up use the [swipeleft](https://github.com/espruino/BangleApps/tree/master/apps/gesture) gesture to reset the timer
diff --git a/apps/simpletimer/app.js b/apps/simpletimer/app.js
index 0bd7992e2..8c8890af3 100644
--- a/apps/simpletimer/app.js
+++ b/apps/simpletimer/app.js
@@ -111,7 +111,6 @@ function reset(value) {
   state = value === 0 ? "unset" : "set";
 }
 
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
 function addWatch() {
   clearWatch();
   setWatch(changeState, BTN1, {
@@ -119,6 +118,16 @@ function addWatch() {
     repeat: true,
     edge: "falling"
   });
+  setWatch(() => {
+    if (state !== "started") {
+      Bangle.showLauncher();
+    }},
+  BTN2,
+  {
+    repeat: false,
+    edge: "falling",
+  },
+  );
   setWatch(
     () => {
       reset(0);