Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Merge remote-tracking branch 'pr/423'

Duarte Santosc62865e624ab
diff --cc frontend/src/store/useUI.js
index abc97980e,862f2d951..5884c3eb7
--- a/frontend/src/store/useUI.js
+++ b/frontend/src/store/useUI.js
@@@ -324,12 -209,13 +324,13 @@@ export const useUI = create((set, get)
// taking off more than is left means "I'm ready now" — same as skipping, and it keeps a
// negative duration out of both the progress bar and the server-side push schedule
if (left <= 0) { get().stopRest(); return }
+ const total = Math.max(tm.total || left, left)
// Paused, there is no end to move and nothing booked on the server: the time is simply held,
// and the notification holds the new figure.
- if (tm.paused) { set({ timer: { ...tm, left, total: tm.total + sec } }); holdRestAlert(left, tm.total + sec); return }
+ if (tm.paused) { set({ timer: { ...tm, left, total } }); holdRestAlert(left, total); return }
const endsAt = tm.endsAt + sec * 1000
- set({ timer: { ...tm, left, total: tm.total + sec, endsAt } })
- bookRestEnd(endsAt, tm.total + sec, tm.kind)
+ set({ timer: { ...tm, left, total, endsAt } })
- bookRestEnd(endsAt, total)
++ bookRestEnd(endsAt, total, tm.kind)
},
// The active list changed shape (an exercise removed or inserted at `at`): keep the rest
// pointing at the same exercise. Returns nothing; the caller decides whether to stop instead.