fix(player): More effectively cancel timeouts when changing play state

gabe565 · Sep 15, 2023 · 536c90e · 536c90e
1 parent cda48fd
commit 536c90e
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/internal/movie/player.go b/internal/movie/player.go
@@ -217,15 +217,13 @@ func (p *Player) OptionsView() string {
 }
 
 func (p *Player) pause() tea.Cmd {
-	p.playCancel()
+	p.clearTimeouts()
 	p.timeoutCtx, p.timeoutCancel = context.WithCancel(context.Background())
 	return tick(p.timeoutCtx, 15*time.Minute, Quit())
 }
 
 func (p *Player) play() tea.Cmd {
-	if p.timeoutCancel != nil {
-		p.timeoutCancel()
-	}
+	p.clearTimeouts()
 	p.playCtx, p.playCancel = context.WithCancel(context.Background())
 	return func() tea.Msg {
 		return frameTickMsg{}
@@ -235,3 +233,12 @@ func (p *Player) play() tea.Cmd {
 func (p Player) isPlaying() bool {
 	return p.playCtx.Err() == nil
 }
+
+func (p *Player) clearTimeouts() {
+	if p.playCancel != nil {
+		p.playCancel()
+	}
+	if p.timeoutCancel != nil {
+		p.timeoutCancel()
+	}
+}