Skip to content

Commit 46bb9ed

Browse files
committed
fix: fix crash when navigating away from Latest Episodes during fetch
Gate latestEpisodesStore subscription by viewState to prevent async fetch completions from updating displayedEpisodes after EpisodeList is destroyed. Also use getEpisodeKey for stable {#each} keys.
1 parent 4a88f13 commit 46bb9ed

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/ui/PodcastView/EpisodeList.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{#if episodes.length === 0 && !isLoading}
8383
<p>No episodes found.</p>
8484
{/if}
85-
{#each episodes as episode (episode.url || episode.streamUrl || `${episode.title}-${episode.episodeDate ?? ""}`)}
85+
{#each episodes as episode, index (getEpisodeKey(episode) ?? `${episode.title}-${episode.episodeDate ?? ""}-${index}`)}
8686
{@const episodePlayed = isEpisodeFinished(episode, $playedEpisodes)}
8787
{#if !$hidePlayedEpisodes || !episodePlayed}
8888
<EpisodeListItem

src/ui/PodcastView/PodcastView.svelte

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
6161
onMount(() => {
6262
const unsubscribePlaylists = playlists.subscribe((pl) => {
63-
displayedPlaylists = [$queue, $favorites, $localFiles, ...Object.values(pl)];
63+
displayedPlaylists = [get(queue), get(favorites), get(localFiles), ...Object.values(pl)];
6464
});
6565
6666
const unsubscribeSavedFeeds = savedFeeds.subscribe((storeValue) => {
@@ -78,11 +78,20 @@
7878
}
7979
});
8080
81+
let currentViewState = get(viewState);
82+
const unsubscribeViewState = viewState.subscribe((vs) => {
83+
currentViewState = vs;
84+
});
85+
8186
const unsubscribeLatestEpisodes = latestEpisodesStore.subscribe(
8287
(episodes) => {
8388
latestEpisodes = episodes;
8489
85-
if (!selectedFeed && !selectedPlaylist) {
90+
if (
91+
currentViewState === ViewState.EpisodeList &&
92+
!selectedFeed &&
93+
!selectedPlaylist
94+
) {
8695
displayedEpisodes = currentSearchQuery
8796
? searchEpisodes(currentSearchQuery, episodes)
8897
: episodes;
@@ -92,6 +101,7 @@
92101
93102
return () => {
94103
unsubscribeLatestEpisodes();
104+
unsubscribeViewState();
95105
unsubscribeSavedFeeds();
96106
unsubscribePlaylists();
97107
};
@@ -297,7 +307,7 @@
297307
<EpisodeList
298308
episodes={displayedEpisodes}
299309
showThumbnails={!selectedFeed || !selectedPlaylist}
300-
isLoading={isFetchingEpisodes}
310+
isLoading={selectedFeed ? loadingFeeds.has(selectedFeed.title) : isFetchingEpisodes}
301311
on:clickEpisode={handleClickEpisode}
302312
on:contextMenuEpisode={handleContextMenuEpisode}
303313
on:clickRefresh={handleClickRefresh}

0 commit comments

Comments
 (0)