Merge branch 'master' into viv-fix-forced-subs

1hitsong · Dec 20, 2024 · b0b58be · b0b58be
2 parents 6306b4b + f73b335
commit b0b58be
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs
@@ -368,7 +368,6 @@ sub onSubtitleChange()
     m.top.control = VideoControl.STOP
 
     m.LoadMetaDataTask.selectedSubtitleIndex = m.top.SelectedSubtitle
-    m.LoadMetaDataTask.selectedAudioStreamIndex = m.top.audioIndex
     m.LoadMetaDataTask.itemId = m.top.id
     m.LoadMetaDataTask.observeField("content", "onVideoContentLoaded")
     m.LoadMetaDataTask.control = TaskControl.RUN
@@ -384,7 +383,6 @@ sub onAudioIndexChange()
 
     m.top.control = VideoControl.STOP
 
-    m.LoadMetaDataTask.selectedSubtitleIndex = m.top.SelectedSubtitle
     m.LoadMetaDataTask.selectedAudioStreamIndex = m.top.audioIndex
     m.LoadMetaDataTask.itemId = m.top.id
     m.LoadMetaDataTask.observeField("content", "onVideoContentLoaded")

diff --git a/source/api/Items.bs b/source/api/Items.bs
@@ -283,10 +283,14 @@ function MusicAlbumList(id as string)
         tmp.RunTimeTicks = item.LookupCI("RunTimeTicks")
 
         tmp.shortdescriptionline1 = item.LookupCI("name")
-        tmp.HDGRIDPOSTERURL = tmp.image.url
-        tmp.hdposterurl = tmp.image.url
-        tmp.SDGRIDPOSTERURL = tmp.image.url
-        tmp.sdposterurl = tmp.image.url
+
+        if isChainValid(tmp, "image.url")
+            tmp.HDGRIDPOSTERURL = tmp.image.url
+            tmp.hdposterurl = tmp.image.url
+            tmp.SDGRIDPOSTERURL = tmp.image.url
+            tmp.sdposterurl = tmp.image.url
+        end if
+
         results.push(tmp)
     end for
 

diff --git a/source/static/whatsNew/1.1.4.json b/source/static/whatsNew/1.1.4.json
@@ -2,5 +2,13 @@
   {
     "description": "Pressing back on home screen focuses 1st item in row, or exits channel if already there",
     "author": "jimdogx"
+  },
+  {
+    "description": "Fix issue that could prevent changing audio & subtitle tracks",
+    "author": "jimdogx"
+  },
+  {
+    "description": "Fix possible crash if music album doesn't have an image",
+    "author": "1hitsong"
   }
 ]