From 51fb98b2fec53531a6d15d75a2c983ef7e290e0b Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Tue, 8 Sep 2015 10:51:18 +0100
Subject: [PATCH] 0.8.0

---
 1080i/Includes_hubMenuItems.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml
index 87dafee..b873499 100644
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@@ -271,8 +271,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon1)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon1)],return)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon2))</visible>
@@ -283,8 +283,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon2)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon2)],return)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon3))</visible>
@@ -296,7 +296,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon3)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon3)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon4))</visible>
@@ -308,7 +309,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon4)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon4)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon5))</visible>
@@ -320,7 +322,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon5)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon5)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon6))</visible>
@@ -332,7 +335,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon6)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon6)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon7))</visible>
@@ -344,7 +348,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon7)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon7)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon8))</visible>
@@ -356,7 +361,8 @@
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon8)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon8)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick>setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">setfocus(51)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">setfocus(56)</onclick>
             </item>
             <!--final bits and bobs-->
             <item>