Merge branch 'master' into viv-fix-race-condition

1hitsong · Dec 16, 2024 · 2243020 · 2243020
2 parents e0f043c + f79a413
commit 2243020
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 130 deletions.
diff --git a/components/home/HomeItem.bs b/components/home/HomeItem.bs
@@ -360,17 +360,24 @@ sub displayEpisodeInfo(localGlobal as object, itemData as object)
         end if
     end if
 
-    if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "webclient"
-        tmpSetting = localGlobal.session.user.Configuration.useEpisodeImagesInNextUpAndResume
-        if isValid(tmpSetting) and tmpSetting
-            m.itemPoster.uri = itemData.LookupCI("thumbnailURL")
-        else
+    episodeimagesnextupSetting = chainLookup(localGlobal, "session.user.settings.ui.general.episodeimagesnextup")
+
+    ' Default to wide poster image
+    m.itemPoster.uri = itemData.LookupCI("widePosterURL")
+
+    if isValid(episodeimagesnextupSetting)
+        if isStringEqual(episodeimagesnextupSetting, "webclient")
+            useEpisodeImagesInNextUpAndResumeSetting = chainLookup(localGlobal, "session.user.Configuration.useEpisodeImagesInNextUpAndResume")
+            if isValid(useEpisodeImagesInNextUpAndResumeSetting) and useEpisodeImagesInNextUpAndResumeSetting
+                m.itemPoster.uri = itemData.LookupCI("thumbnailURL")
+            else
+                m.itemPoster.uri = itemData.LookupCI("widePosterURL")
+            end if
+        else if isStringEqual(episodeimagesnextupSetting, "show")
             m.itemPoster.uri = itemData.LookupCI("widePosterURL")
+        else if isStringEqual(episodeimagesnextupSetting, "episode")
+            m.itemPoster.uri = itemData.LookupCI("thumbnailURL")
         end if
-    else if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "show"
-        m.itemPoster.uri = itemData.LookupCI("widePosterURL")
-    else if localGlobal.session.user.settings["ui.general.episodeimagesnextup"] = "episode"
-        m.itemPoster.uri = itemData.LookupCI("thumbnailURL")
     end if
 
     ' Set Series and Episode Number for Extra Text

diff --git a/manifest b/manifest
@@ -3,7 +3,7 @@
 title=viv
 major_version=1
 minor_version=1
-build_version=1
+build_version=3
 
 ### Main Menu Icons / Channel Poster Artwork
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,18 +1,18 @@
 {
   "name": "viv",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Unofficial Roku app for Jellyfin media server",
   "dependencies": {
     "@rokucommunity/bslib": "0.1.1",
     "brighterscript-formatter": "1.7.6"
   },
   "devDependencies": {
     "@rokucommunity/bslint": "0.8.26",
-    "brighterscript": "0.68.1",
+    "brighterscript": "0.68.2",
     "jshint": "2.13.6",
     "rimraf": "6.0.1",
-    "roku-deploy": "3.12.2",
+    "roku-deploy": "3.12.3",
     "rooibos-roku": "5.14.0",
     "ropm": "0.10.27",
     "undent": "0.1.0"

diff --git a/source/static/whatsNew/1.1.2.json b/source/static/whatsNew/1.1.2.json
diff --git a/source/static/whatsNew/1.1.3.json b/source/static/whatsNew/1.1.3.json
@@ -0,0 +1,6 @@
+[
+  {
+    "description": "Fix crash on home screen",
+    "author": "1hitsong"
+  }
+]