From c6e655a7046519e6ffe836b969f9f8c0d5b92d11 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Sat, 8 Apr 2023 18:49:32 -0700
Subject: [PATCH] fix #125 - search state not being properly restored

---
 CHANGELOG.md              | 1 +
 ui/browsing/albumspage.go | 3 ++-
 ui/browsing/genrepage.go  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e008cb..bc792d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Fixes
 - **todo-commithash** Don't show update available prompt if the found version is the same as the running app version
 - [#120](https://github.com/dweymouth/supersonic/issues/120),[#87](https://github.com/dweymouth/supersonic/issues/87) Update Mac build process to support OS versions back to High Sierra (thanks @whorfin!)
+- [#125](https://github.com/dweymouth/supersonic/issues/125) Navigating back twice to an albums page with search result clears search state
 
 ## [0.1.0-beta] - 2023-04-01
 
diff --git a/ui/browsing/albumspage.go b/ui/browsing/albumspage.go
index 124bb97..ecfcf1a 100644
--- a/ui/browsing/albumspage.go
+++ b/ui/browsing/albumspage.go
@@ -120,7 +120,8 @@ func restoreAlbumsPage(saved *savedAlbumsPage) *AlbumsPage {
 	a.searcher = widgets.NewSearcher()
 	a.searcher.OnSearched = a.OnSearched
 	a.searcher.Entry.Text = saved.searchText
-	if saved.searchText != "" {
+	a.searchText = saved.searchText
+	if a.searchText != "" {
 		a.searchGrid = widgets.NewAlbumGridFromState(saved.searchGridState)
 	}
 	a.createContainer(saved.searchText != "")
diff --git a/ui/browsing/genrepage.go b/ui/browsing/genrepage.go
index 2056352..f71bfcb 100644
--- a/ui/browsing/genrepage.go
+++ b/ui/browsing/genrepage.go
@@ -98,7 +98,8 @@ func restoreGenrePage(saved *savedGenrePage) *GenrePage {
 	g.searcher = widgets.NewSearcher()
 	g.searcher.OnSearched = g.OnSearched
 	g.searcher.Entry.Text = saved.searchText
-	if saved.searchText != "" {
+	g.searchText = saved.searchText
+	if g.searchText != "" {
 		g.searchGrid = widgets.NewAlbumGridFromState(saved.searchGridState)
 	}
 	g.createContainer(saved.searchText != "")