From 6ad1aab1048173a36cf3b3762b3493b6cf76bd4b Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Wed, 22 Nov 2023 21:44:23 +0100
Subject: [PATCH] fix(settings): init settings issue

---
 src/app/settings/settings.component.ts | 32 ++++++++++++--------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index 10fcc4d66..173591291 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -128,23 +128,21 @@ export class SettingsComponent implements OnInit {
             .getValueFromLocalStorage(STORE_KEY.Settings)
             .subscribe((settings: Settings) => {
                 if (settings) {
-                    this.settingsForm.setValue({
-                        player: settings.player
-                            ? settings.player
-                            : VideoPlayer.VideoJs,
-                        ...(this.isElectron ? { epgUrl: [] } : {}),
-                        language: settings.language
-                            ? settings.language
-                            : Language.ENGLISH,
-                        showCaptions: settings.showCaptions
-                            ? settings.showCaptions
-                            : false,
-                        theme: settings.theme
-                            ? settings.theme
-                            : Theme.LightTheme,
-                        mpvPlayerPath: settings.mpvPlayerPath,
-                        vlcPlayerPath: settings.vlcPlayerPath,
-                    });
+                    try {
+                        this.settingsForm.setValue({
+                            player: settings.player
+                                ? settings.player
+                                : VideoPlayer.VideoJs,
+                            ...(this.isElectron ? { epgUrl: [] } : {}),
+                            language: settings.language ?? Language.ENGLISH,
+                            showCaptions: settings.showCaptions ?? false,
+                            theme: settings.theme ?? Theme.LightTheme,
+                            mpvPlayerPath: settings.mpvPlayerPath ?? '',
+                            vlcPlayerPath: settings.vlcPlayerPath ?? '',
+                        });
+                    } catch (error) {
+                        throw new Error(error);
+                    }
 
                     if (this.isElectron) {
                         this.setEpgUrls(settings.epgUrl);