From c3b97637246640a4be36ba035bb82249c475ad8d Mon Sep 17 00:00:00 2001
From: Drew Weymouth <drew.weymouth@openly.com>
Date: Thu, 5 Mar 2026 06:42:22 -0800
Subject: [PATCH] handle stop properly when pendingLoadPaused

---
 backend/playbackengine.go | 6 +++++-
 ui/bottompanel.go         | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/playbackengine.go b/backend/playbackengine.go
index c34f5fb..7dfb832 100644
--- a/backend/playbackengine.go
+++ b/backend/playbackengine.go
@@ -511,7 +511,11 @@ func (p *playbackEngine) IsSeeking() bool {
 }
 
 func (p *playbackEngine) Stop() error {
-	p.pendingLoadPaused = false
+	if p.pendingLoadPaused {
+		p.pendingLoadPaused = false
+		p.pendingLoadStartTime = 0
+		p.handleOnStopped()
+	}
 	return p.player.Stop(false)
 }
 
diff --git a/ui/bottompanel.go b/ui/bottompanel.go
index c6c26b6..234cb14 100644
--- a/ui/bottompanel.go
+++ b/ui/bottompanel.go
@@ -47,7 +47,10 @@ func NewBottomPanel(pm *backend.PlaybackManager, im *backend.ImageManager, contr
 
 	pm.OnPaused(util.FyneDoFunc(func() { bp.Controls.SetPlaying(false) }))
 	pm.OnPlaying(util.FyneDoFunc(func() { bp.Controls.SetPlaying(true) }))
-	pm.OnStopped(util.FyneDoFunc(func() { bp.Controls.SetPlaying(false) }))
+	pm.OnStopped(util.FyneDoFunc(func() {
+		bp.Controls.SetPlaying(false)
+		bp.Controls.UpdatePlayTime(0, 0)
+	}))
 
 	bp.NowPlaying = widgets.NewNowPlayingCard()
 	bp.NowPlaying.ShowAlbumYear = cfg.AlbumsPage.ShowYears