Fix watchface timeout

Open-Smartwatch · Apr 24, 2022 · d61da9d · d61da9d
1 parent 785ad5d
commit d61da9d
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/apps/main/switcher.cpp b/src/apps/main/switcher.cpp
@@ -54,17 +54,17 @@ void OswAppSwitcher::loop() {
     }
   }
 
-  if (_enableAutoSleep && *_rtcAppIndex == 0 && !hal->btnIsDown(_btn)) {
+  if (_enableAutoSleep && *_rtcAppIndex == 0) {
+    if (hal->btnIsDown(BUTTON_1) || hal->btnIsDown(BUTTON_2) || hal->btnIsDown(BUTTON_3)) {
+    	appOnScreenSince = millis();
+    }
     short timeout = OswConfigAllKeys::settingDisplayTimeout.get();
-    if (*_rtcAppIndex == 0 && (millis() - appOnScreenSince) > timeout * 1000) {
-      if (hal->btnIsDown(BUTTON_1) || hal->btnIsDown(BUTTON_2) || hal->btnIsDown(BUTTON_3)) {
-        appOnScreenSince = millis();
-      } else if(timeout > 0) {
-        Serial.print("Going to sleep after ");
-        Serial.print(timeout);
-        Serial.println(" seconds");
-        this->sleep();
-      }
+    if (timeout > 0 && (millis() - appOnScreenSince) > timeout * 1000) {
+	Serial.print("Going to sleep after ");
+	Serial.print(timeout);
+	Serial.println(" seconds");
+	this->sleep();
+
     }
   }