From bf1fe5de4e7d383fd2be7184ca4012e696c6d61a Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 23 Apr 2020 06:58:14 +0100
Subject: [PATCH] Fix logic leak, make sure draw functions only deal with
 drawing UI

---
 apps/buffgym/buffgym-exercise.js |  9 +++++++++
 apps/buffgym/buffgym.app.js      | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/buffgym/buffgym-exercise.js b/apps/buffgym/buffgym-exercise.js
index 078e206de..7d631182e 100644
--- a/apps/buffgym/buffgym-exercise.js
+++ b/apps/buffgym/buffgym-exercise.js
@@ -69,6 +69,15 @@ exports = class Exercise {
     }, 1000 * this.restPeriod);
 
     this._restInterval = setInterval(() => {
+      this.decRestPeriod();
+
+      if (this.restPeriod < 0) {
+        this.resetRestTimer();
+        this.next();
+
+        return;
+      }
+
       workout.emit("redraw");
     }, 1000 );
   }
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
index b92b2bb98..d1c0386ff 100755
--- a/apps/buffgym/buffgym.app.js
+++ b/apps/buffgym/buffgym.app.js
@@ -104,14 +104,6 @@ function drawSetComp() {
 
 function drawRestTimer(workout) {
   const exercise = workout.currentExercise();
-  const motivation = "Take a breather..";
-
-  if (exercise.restPeriod <= 0) {
-    exercise.resetRestTimer();
-    workout.next();
-
-    return;
-  }
 
   g.clear();
   drawMenu({showBTN2: true});
@@ -124,8 +116,6 @@ function drawRestTimer(workout) {
   g.setFont("6x8", 5);
   g.drawString(exercise.restPeriod, (W / 2) + 2, (H / 2) - 19);
   g.flip();
-
-  exercise.decRestPeriod();
 }
 
 function redraw(workout) {