From 26f7d780c9da891d9e581398187d96c706d6a20e Mon Sep 17 00:00:00 2001
From: jcorporation <mail@jcgames.de>
Date: Thu, 12 Oct 2023 23:43:31 +0200
Subject: [PATCH] Fix: initial startup view

---
 htdocs/js/globales.js      |  2 +-
 htdocs/js/modalSettings.js |  4 ++++
 htdocs/js/router.js        | 14 +++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/js/globales.js b/htdocs/js/globales.js
index 05a654cd6..dd1f70f02 100644
--- a/htdocs/js/globales.js
+++ b/htdocs/js/globales.js
@@ -770,7 +770,7 @@ const settingsWebuiFields = {
         "onChange": "eventChangeLocale"
     },
     "startupView": {
-        "defaultValue": null,
+        "defaultValue": "Home",
         "validValues": {
             "Home": "Home",
             "Playback": "Playback",
diff --git a/htdocs/js/modalSettings.js b/htdocs/js/modalSettings.js
index 766e4e012..a157deaa0 100644
--- a/htdocs/js/modalSettings.js
+++ b/htdocs/js/modalSettings.js
@@ -136,12 +136,16 @@ function populateSettingsFrm() {
     jsonToForm(settings.webuiSettings, settingsWebuiFields, 'modalSettings');
     jsonToForm(settings.partition, settingsPartitionFields, 'modalSettings');
     jsonToForm(localSettings, settingsLocalFields, 'modalSettings');
+
     // background image select
     getBgImageList();
     const bgImageInput = elGetById('modalSettingsBgImageInput');
     setData(bgImageInput, 'value', settings.webuiSettings.bgImage);
     bgImageInput.value = getBgImageText(settings.webuiSettings.bgImage);
 
+    // home
+    elGetById('modalSettingsStartupViewInput').options[0].classList.add('featHome');
+
     // theme
     toggleThemeInputs(settings.webuiSettings.theme);
 
diff --git a/htdocs/js/router.js b/htdocs/js/router.js
index c0b48e1e6..f82c8ee6c 100644
--- a/htdocs/js/router.js
+++ b/htdocs/js/router.js
@@ -199,14 +199,14 @@ function appRoute(card, tab, view, offset, limit, filter, sort, tag, search) {
         }
         if (jsonHash === null) {
             appPrepare();
-            let initialStartupView = settings.webuiSettings.startupView;
-            if (initialStartupView === undefined ||
-                initialStartupView === null)
-            {
-                initialStartupView = features.featHome === true
+            const initialStartupView = settings.webuiSettings.startupView === undefined || settings.webuiSettings.startupView === null
+                ? features.featHome === true
                     ? 'Home'
-                    : 'Playback';
-            }
+                    : 'Playback'
+                : features.featHome === false && settings.webuiSettings.startupView === 'Home'
+                    ? 'Playback'
+                    : settings.webuiSettings.startupView;
+            settings.webuiSettings.startupView = initialStartupView;
             const path = initialStartupView.split('/');
             // @ts-ignore
             appGoto(...path);