From fb3fb7589ca77c0d1cdbe48fcb7e9b84e8f07f15 Mon Sep 17 00:00:00 2001 From: Michael Zhao Date: Tue, 23 Sep 2025 18:19:43 -0500 Subject: [PATCH] Fix issue where clock isn't getting reset --- client/src/pages/admin/settings.tsx | 1 + server/router/admin.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/pages/admin/settings.tsx b/client/src/pages/admin/settings.tsx index 9ac1ad2..4065df0 100644 --- a/client/src/pages/admin/settings.tsx +++ b/client/src/pages/admin/settings.tsx @@ -463,6 +463,7 @@ const AdminSettings = () => { alert('Clock reset!'); setClockResetPopup(false); + fetchClock(); }; const toggleSyncClock = async () => { diff --git a/server/router/admin.go b/server/router/admin.go index 7b773f7..ec539ad 100644 --- a/server/router/admin.go +++ b/server/router/admin.go @@ -175,8 +175,8 @@ func ResetClock(ctx *gin.Context) { state.Clock.Mutex.Lock() defer state.Clock.Mutex.Unlock() - // Unpause the clock - state.Clock.State.Resume() + // Reset the clock + state.Clock.State.Reset() // Backup err := database.UpdateClockConditional(state.Db, ctx, &state.Clock.State)