From 4a53b2061803d4e6641576dfc4fe96aa2ee15a7c Mon Sep 17 00:00:00 2001 From: Alex Kim Date: Thu, 12 Dec 2024 05:38:14 +1100 Subject: [PATCH] Added fix --- components/settings/MediaContext.tsx | 38 +++++++++++++++------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/components/settings/MediaContext.tsx b/components/settings/MediaContext.tsx index 68ebe1f7..64acd5d1 100644 --- a/components/settings/MediaContext.tsx +++ b/components/settings/MediaContext.tsx @@ -111,26 +111,28 @@ export const MediaProvider = ({ children }: { children: ReactNode }) => { // Set default settings from user configuration.s useEffect(() => { - const userSubtitlePreference = - user?.Configuration?.SubtitleLanguagePreference; - const userAudioPreference = user?.Configuration?.AudioLanguagePreference; + if (user && cultures) { + const userSubtitlePreference = + user?.Configuration?.SubtitleLanguagePreference; + const userAudioPreference = user?.Configuration?.AudioLanguagePreference; - const subtitlePreference = cultures.find( - (x) => x.ThreeLetterISOLanguageName === userSubtitlePreference - ); - const audioPreference = cultures.find( - (x) => x.ThreeLetterISOLanguageName === userAudioPreference - ); + const subtitlePreference = cultures.find( + (x) => x.ThreeLetterISOLanguageName === userSubtitlePreference + ); + const audioPreference = cultures.find( + (x) => x.ThreeLetterISOLanguageName === userAudioPreference + ); - updateSettings({ - defaultSubtitleLanguage: subtitlePreference, - defaultAudioLanguage: audioPreference, - subtitleMode: user?.Configuration?.SubtitleMode, - playDefaultAudioTrack: user?.Configuration?.PlayDefaultAudioTrack, - rememberAudioSelections: user?.Configuration?.RememberAudioSelections, - rememberSubtitleSelections: - user?.Configuration?.RememberSubtitleSelections, - }); + updateSettings({ + defaultSubtitleLanguage: subtitlePreference, + defaultAudioLanguage: audioPreference, + subtitleMode: user?.Configuration?.SubtitleMode, + playDefaultAudioTrack: user?.Configuration?.PlayDefaultAudioTrack, + rememberAudioSelections: user?.Configuration?.RememberAudioSelections, + rememberSubtitleSelections: + user?.Configuration?.RememberSubtitleSelections, + }); + } }, [user, cultures]); if (!api) return null;