From 078a78fcbf760087099638e1be1bdc04322a05d7 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sun, 5 Apr 2020 21:08:46 +0100
Subject: [PATCH] bug fixes

---
 1080i/Includes.xml                     | 9 ++++-----
 1080i/custom_musicPlayerFullscreen.xml | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 7d7761d..808595b 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -61,7 +61,6 @@
     <!--touchscreen back function-->
 	<expression name="openSideBlade">[window.isactive(pictures) + String.IsEqual(container.folderpath,] | String.IsEqual(container.folderpath,addons://sources/game) | [window.isactive(games) + String.IsEqual(container.folderpath,] | String.IsEqual(container.folderpath,sources://video/) | String.IsEqual(container.folderpath,special://videoplaylists/) | String.IsEqual(container.folderpath,addons://sources/video) | String.IsEqual(container.folderpath,pvr://recordings/tv/active/) | String.IsEqual(container.folderpath,sources://music/) | String.IsEqual(container.folderpath,addons://sources/audio) | String.IsEqual(container.folderpath,special://musicplaylists/) | String.IsEqual(container.folderpath,musicdb://genres/) | String.IsEqual(container.folderpath,musicdb://artists/) | String.IsEqual(container.folderpath,musicdb://albums/) | container.content(movies) | container.content(tvshows) | window.isactive(TVChannels) | window.isactive(RadioChannels) | window.isactive(TVGuide) | window.isactve(TVRecordings)</expression>
 
-
 	<!--item fanart-->
     <include name="itemFanart">
         <control type="wraplist" id="99999">
@@ -311,7 +310,7 @@
 
 			<!--standard back-->
 			<control type="button" id="8542">
-				<visible>!$EXP[openSideBlade]</visible>
+				<visible>!$EXP[openSideBlade] | window.isactive(1103)</visible>
 	            <description>back button</description>
 				<posx>-5</posx>
 	            <posy>0</posy>
@@ -324,12 +323,12 @@
 				<textcolor>22FFFFFF</textcolor>
 		        <focusedcolor>22FFFFFF</focusedcolor>
 				<label></label>
-				<onclick >back</onclick>
+				<onclick>back</onclick>
 			</control>
 			
 			<!--sideblade open-->
 			<control type="button" id="8514">
-				<visible>$EXP[openSideBlade]</visible>
+				<visible>$EXP[openSideBlade] + !window.isactive(1103)</visible>
 	            <description>back button</description>
 				<posx>-5</posx>
 	            <posy>0</posy>
@@ -349,7 +348,6 @@
 			<!--home-->
 			<control type="button" id="8520">
 	            <description>home</description>
-				<enabled>!window.isactive(home)</enabled>
 				<posx>-5</posx>
 	            <posy>810</posy>
 	            <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
@@ -361,6 +359,7 @@
 				<textcolor>22FFFFFF</textcolor>
 		        <focusedcolor>22FFFFFF</focusedcolor>
 				<label></label>
+				<onclick>dialog.close(all,true)</onclick>
 				<onclick>activateWindow(home)</onclick>
 	        </control>			
 			
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 328e8ac..be51f2c 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -70,7 +70,7 @@
 						<align>center</align>
 						<font>menuTitle3</font>
 						<textcolor>textActive</textcolor>
-						<scroll>false</scroll>
+						<scroll>true</scroll>
 						<label>$INFO[MusicPlayer.Title]</label>
 						<shadowcolor>99000000</shadowcolor>
 						<wrapmultiline>true</wrapmultiline>
@@ -132,7 +132,7 @@
 				            <height>1-col</height>
 							<width>1-col</width>
 							<font>symbol</font>
-							<textoffsetx>24</textoffsetx>
+							<textoffsetx>25</textoffsetx>
 							<textcolor>22FFFFFF</textcolor>
 					        <focusedcolor>22FFFFFF</focusedcolor>
 							<label></label>
@@ -148,7 +148,7 @@
 				            <height>1-col</height>
 							<width>1-col</width>
 							<font>symbol</font>
-							<textoffsetx>24</textoffsetx>
+							<textoffsetx>25</textoffsetx>
 							<textcolor>22FFFFFF</textcolor>
 					        <focusedcolor>22FFFFFF</focusedcolor>
 							<label></label>