From c3efdcf6f2a727dcaa2109e5db82fb3a7149ef83 Mon Sep 17 00:00:00 2001
From: realcopacetic <ahekmat400@googlemail.com>
Date: Thu, 9 May 2024 10:29:57 +0100
Subject: [PATCH] bug fixing wip

---
 16x9/Home.xml                   | 4 ++--
 16x9/MyVideoNav.xml             | 2 +-
 16x9/OnLoadUnload.xml           | 2 +-
 16x9/Timers.xml                 | 4 ++--
 16x9/Viewtype_501_Billboard.xml | 5 +++--
 16x9/Viewtype_505_Grid.xml      | 2 --
 addon.xml                       | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/16x9/Home.xml b/16x9/Home.xml
index 61bb9a36..c0cef3de 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -2,7 +2,7 @@
 <window>
 	<!-- home -->
 	<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=3000&amp;group=mainmenu|shutdownmenu)</onload>
-	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onunload>
+	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunload>
 	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunload>
 	<defaultcontrol always="true">4010</defaultcontrol>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
@@ -84,7 +84,7 @@
 		</control>
 		<control type="label">
 			<align>right</align>
-			<label>$INFO[Window(home).Property(Trailer_Autoscroll)]</label>
+			<label>Trailer Autoplay: $INFO[Window(home).Property(Trailer_Autoplay)][CR]Trailer Autoscroll: $INFO[Window(home).Property(Trailer_Autoscroll)]</label>
 		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/16x9/MyVideoNav.xml b/16x9/MyVideoNav.xml
index 653feba9..9d94bc95 100644
--- a/16x9/MyVideoNav.xml
+++ b/16x9/MyVideoNav.xml
@@ -4,7 +4,7 @@
 	<include content="Multiart_Reset_OnLoad" />
 	<onunload>ClearProperty(OptionsMenu,home)</onunload>
 	<onunload>ClearProperty(Scrollbars,home)</onunload>
-	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onunload>
+	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunload>
 	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunload>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<menucontrol>3000</menucontrol>
diff --git a/16x9/OnLoadUnload.xml b/16x9/OnLoadUnload.xml
index 65dfc3a9..520d22f9 100644
--- a/16x9/OnLoadUnload.xml
+++ b/16x9/OnLoadUnload.xml
@@ -43,7 +43,7 @@
 	</include>
 
 	<include name="movieinformation_OnLoadUnload">
-		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onload>
+		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onload>
 		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onload>
 		<onload condition="!String.IsEmpty(ListItem.DBID)">SetProperty(SelectedItem,$INFO[ListItem.DBID],movieinformation)</onload>
 		<onload condition="String.IsEmpty(ListItem.DBID) + !String.IsEmpty(ListItem.Property(tmdb_id))">SetProperty(SelectedItem,$INFO[ListItem.Property(tmdb_id)],movieinformation)</onload>
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index 8fc03119..83e2d388 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -72,13 +72,13 @@
   <timer>
     <name>widget_spotlight</name>
     <start reset="true">Control.HasFocus(3201) | Control.HasFocus(3202) | Control.HasFocus(3203) | Control.HasFocus(3204) | Control.HasFocus(3205) | Control.HasFocus(3206) | Control.HasFocus(3207) | Control.HasFocus(3208) | Control.HasFocus(3209)</start>
-    <stop>[[Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),15) + System.IdleTime(15) + String.IsEmpty(Window(home).Property(Trailer_Autoscroll))] | [Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),3) + System.IdleTime(3) + String.IsEqual(Window(home).Property(Trailer_Autoscroll),true)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo</stop>
-    <onstop condition="!String.IsEmpty(Window(home).Property(Trailer_Autoplay))">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <stop>[[Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),15) + System.IdleTime(15) + String.IsEmpty(Window(home).Property(Trailer_Autoscroll))] | [Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),4) + System.IdleTime(4) + String.IsEqual(Window(home).Property(Trailer_Autoscroll),true)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo</stop>
     <onstop condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_AutoScroll)">Control.Move(3201,1)</onstop>
     <onstop condition="Control.HasFocus(3202) + Skin.HasSetting(Widget2_AutoScroll)">Control.Move(3202,1)</onstop>
     <onstop condition="Control.HasFocus(3203) + Skin.HasSetting(Widget3_AutoScroll)">Control.Move(3203,1)</onstop>
     <onstop condition="Control.HasFocus(3204) + Skin.HasSetting(Widget4_AutoScroll)">Control.Move(3204,1)</onstop>
     <onstop condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_AutoScroll)">Control.Move(3205,1)</onstop>
+    <onstop condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_AutoScroll) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
     <onstop condition="Control.HasFocus(3206) + Skin.HasSetting(Widget6_AutoScroll)">Control.Move(3206,1)</onstop>
     <onstop condition="Control.HasFocus(3207) + Skin.HasSetting(Widget7_AutoScroll)">Control.Move(3207,1)</onstop>
     <onstop condition="Control.HasFocus(3208) + Skin.HasSetting(Widget8_AutoScroll)">Control.Move(3208,1)</onstop>
diff --git a/16x9/Viewtype_501_Billboard.xml b/16x9/Viewtype_501_Billboard.xml
index a2d273fa..062b137f 100644
--- a/16x9/Viewtype_501_Billboard.xml
+++ b/16x9/Viewtype_501_Billboard.xml
@@ -43,11 +43,12 @@
 				<include content="Progress" condition="Window.Is(videos) | Window.Is(music) | Window.Is(home) | Window.Is(movieinformation)">
 					<param name="id" value="$PARAM[id]" />
 				</include>
-				<include content="Common_Details" />
+				<include content="Common_Details">
+					<param name="widget_clearlogos" value="$PARAM[widget_clearlogos]" />
+				</include>
 				<include content="Now_Playing_Icon" condition="Window.Is(videos) | Window.Is(music)">
 					<param name="visible" value="$EXP[ListItem(0)_NowPlaying]" />
 					<param name="color" value="$VAR[Light_Color]" />
-					<param name="widget_clearlogos" value="$PARAM[widget_clearlogos]" />
 					<animation effect="slide" end="510,450" time="0" condition="true">Conditional</animation>
 					<animation effect="slide" end="180,0" time="0" condition="!$EXP[BillboardView_Flags_Studio_IsVisible] | String.IsEqual(Control.GetLabel(6303),flags/blank.png)">Conditional</animation>
 					<animation effect="slide" end="180,0" time="0" condition="!$EXP[BillboardView_Flags_Rating_IsVisible] | String.IsEqual(Control.GetLabel(6304),flags/blank.png)">Conditional</animation>
diff --git a/16x9/Viewtype_505_Grid.xml b/16x9/Viewtype_505_Grid.xml
index bcd0c840..b408a0ad 100644
--- a/16x9/Viewtype_505_Grid.xml
+++ b/16x9/Viewtype_505_Grid.xml
@@ -36,8 +36,6 @@
 					<top>180</top>
 					<width>1920</width>
 					<height>900</height>
-					<onfocus condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onfocus>
-					<onfocus condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onfocus>
 					<onfocus>ClearProperty(Widget_DBID,home)</onfocus>
 					<include content="Grid_Navigation" />
 					<pagecontrol>60</pagecontrol>
diff --git a/addon.xml b/addon.xml
index fad94f36..6edf5771 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,7 +7,7 @@
 		<import addon="script.skinshortcuts" version="1.1.5" />
 		<import addon="service.upnext" version="1.1.9+MATRIX.1" />
 	</requires>
-	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="false">
+	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="true">
 		<res width="1920" height="1080" aspect="16:9" default="true" folder="16x9" />
 	</extension>
 	<extension point="xbmc.addon.metadata">