From 0b03177b7fb9fcf37d5a5272bd5ffe5d058d1c96 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Wed, 25 Jan 2023 20:50:21 +1300 Subject: [PATCH] Safely handling non-result responses from Genius (for lyrics) --- src/js/services/genius/actions.js | 4 +++- src/js/views/Modals/KioskMode.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/services/genius/actions.js b/src/js/services/genius/actions.js index e34a5bd0..b512b894 100755 --- a/src/js/services/genius/actions.js +++ b/src/js/services/genius/actions.js @@ -258,7 +258,9 @@ export function findTrackLyrics(uri) { // Immediately go and get the first result's lyrics const lyrics_result = lyrics_results[0]; - dispatch(getTrackLyrics(track.uri, lyrics_result.path)); + if (lyrics_result) { + dispatch(getTrackLyrics(track.uri, lyrics_result.path)); + } } dispatch(uiActions.stopLoading(loader_key)); }, diff --git a/src/js/views/Modals/KioskMode.js b/src/js/views/Modals/KioskMode.js index ed4d61c6..b9315047 100755 --- a/src/js/views/Modals/KioskMode.js +++ b/src/js/views/Modals/KioskMode.js @@ -106,7 +106,7 @@ const KioskMode = () => { if (current_track.lyrics) return; // We got results, but failed to load the lyrics, so re-try - if (current_track.lyrics_results && current_track.lyrics === null) { + if (current_track?.lyrics_results && current_track.lyrics === null) { dispatch(geniusActions.getTrackLyrics(current_track.uri, current_track.path)); return; }