Skip to content

Fix issue where clock isn't getting reset #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelZhao21 merged 1 commit into from
Sep 23, 2025
Merged

Fix issue where clock isn't getting reset #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/pages/admin/settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ const AdminSettings = () => {

alert('Clock reset!');
setClockResetPopup(false);
fetchClock();
};

const toggleSyncClock = async () => {
Expand Down
4 changes: 2 additions & 2 deletions server/router/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down