From e0f043c35ca169cc389c6c0107c2b046283f8418 Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Mon, 16 Dec 2024 06:23:27 -0700
Subject: [PATCH 1/3] Fix potential race condition

---
 components/video/VideoPlayerView.bs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs
index fa788ee21..c92fb612f 100644
--- a/components/video/VideoPlayerView.bs
+++ b/components/video/VideoPlayerView.bs
@@ -367,7 +367,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
@@ -383,7 +382,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")

From b74ab36ee9a0ce70fb76d673074134fc5ed55528 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Wed, 18 Dec 2024 18:57:31 -0500
Subject: [PATCH 2/3] Fix possible crash if music album doesn't have an image

---
 source/api/Items.bs               | 12 ++++++++----
 source/static/whatsNew/1.1.4.json |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/source/api/Items.bs b/source/api/Items.bs
index 5e58ed727..8e695d742 100644
--- 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
index 8bfca6a00..f2cea07b7 100644
--- a/source/static/whatsNew/1.1.4.json
+++ b/source/static/whatsNew/1.1.4.json
@@ -2,5 +2,9 @@
   {
     "description": "Pressing back on home screen focuses 1st item in row, or exits channel if already there",
     "author": "jimdogx"
+  },
+  {
+    "description": "Fix possible crash if music album doesn't have an image",
+    "author": "1hitsong"
   }
 ]
\ No newline at end of file

From f73b33567b6d3b6468c5597133f64a233e9de276 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Wed, 18 Dec 2024 19:40:12 -0500
Subject: [PATCH 3/3] Update What's New content

---
 source/static/whatsNew/1.1.4.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/static/whatsNew/1.1.4.json b/source/static/whatsNew/1.1.4.json
index f2cea07b7..0ac55495b 100644
--- a/source/static/whatsNew/1.1.4.json
+++ b/source/static/whatsNew/1.1.4.json
@@ -3,6 +3,10 @@
     "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"