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

components/home/Home.bs

@@ -1,6 +1,7 @@
 import "pkg:/source/api/baserequest.bs"
 import "pkg:/source/api/Image.bs"
 import "pkg:/source/enums/ColorPalette.bs"
+import "pkg:/source/enums/KeyCode.bs"
 import "pkg:/source/utils/config.bs"
 import "pkg:/source/utils/deviceCapabilities.bs"
 import "pkg:/source/utils/misc.bs"
@@ -87,3 +88,18 @@ sub postFinished()
     m.postTask.unobserveField("responseCode")
     m.postTask.callFunc("empty")
 end sub
+
+' Special handling for key presses on the home screen.
+function onKeyEvent(key as string, press as boolean) as boolean
+    if not press then return false
+
+    ' If the user hit back and is not on the first item of the row,
+    ' assume they want to go to the first item of the row.
+    ' Otherwise, they are exiting the app.
+    if key = KeyCode.Back and m.homeRows.currFocusColumn > 0
+        m.homeRows.jumpToRowItem = [m.homeRows.currFocusRow, 0]
+        return true
+    end if
+
+    return false
+end function

source/Main.bs

@@ -87,7 +87,7 @@ sub Main (args as dynamic) as void
         msg = wait(0, m.port)
 
         if type(msg) = "roSGScreenEvent" and msg.isScreenClosed()
-            print "CLOSING SCREEN"
+            print "SCREEN CLOSED"
             return
         end if
 

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
 

source/static/whatsNew/1.1.4.json

@@ -0,0 +1,10 @@
+[
+  {
+    "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"
+  }
+]

source/utils/misc.bs

@@ -336,10 +336,10 @@ function isChainValid(root as dynamic, propertyPath as string) as boolean
     if properties.count() = 0 then return true
     if properties[0] = "" then return true
 
-    if not isValid(rootPath.LookupCI(properties[0])) then return false
-
     rootPath = rootPath.LookupCI(properties[0])
 
+    if not isValid(rootPath) then return false
+
     properties.shift()
 
     if properties.count() <> 0