Merge pull request #2029 from cewert/fix-homeitem-crash
Some checks are pending
Automation 🤖 / Project board 📊 (push) Waiting to run
Automation 🤖 / Labeling 🏷️ (push) Waiting to run
build-dev / dev (push) Waiting to run
build-prod / prod (push) Waiting to run

This commit is contained in:
Charles Ewert 2024-11-08 17:46:34 -05:00 committed by GitHub
commit a316387974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -62,10 +62,15 @@ sub itemContentChanged()
if isValid(m.unplayedCount) then m.unplayedCount.visible = false
itemData = m.top.itemContent
if itemData = invalid then return
userSettings = m.global.session.user.settings
itemData.Title = itemData.name ' Temporarily required while we move from "HomeItem" to "JFContentItem"
' validate to prevent crash
userSettings = invalid
if isValid(m.global) and isValid(m.global.session) and isValid(m.global.session.user) and isValid(m.global.session.user.settings)
userSettings = m.global.session.user.settings
end if
' validate to prevent crash
if not isValid(m.itemPoster) then initItemPoster()
if not isValid(m.itemText) then initItemText()
@ -164,17 +169,22 @@ sub itemContentChanged()
drawProgressBar(itemData)
end if
if userSettings["ui.general.episodeimagesnextup"] = "webclient"
tmpSetting = m.global.session.user.Configuration.useEpisodeImagesInNextUpAndResume
if isValid(tmpSetting) and tmpSetting
m.itemPoster.uri = itemData.thumbnailURL
else
if isValid(userSettings)
if userSettings["ui.general.episodeimagesnextup"] = "webclient"
tmpSetting = m.global.session.user.Configuration.useEpisodeImagesInNextUpAndResume
if isValid(tmpSetting) and tmpSetting
m.itemPoster.uri = itemData.thumbnailURL
else
m.itemPoster.uri = itemData.widePosterURL
end if
else if userSettings["ui.general.episodeimagesnextup"] = "show"
m.itemPoster.uri = itemData.widePosterURL
else if userSettings["ui.general.episodeimagesnextup"] = "episode"
m.itemPoster.uri = itemData.thumbnailURL
end if
else if userSettings["ui.general.episodeimagesnextup"] = "show"
else
' use show image if user settings are invalid for some reason
m.itemPoster.uri = itemData.widePosterURL
else if userSettings["ui.general.episodeimagesnextup"] = "episode"
m.itemPoster.uri = itemData.thumbnailURL
end if
' Set Series and Episode Number for Extra Text