From d02a3b454b59f02f257284901cb0801197fcf8bd Mon Sep 17 00:00:00 2001
From: David Vukovic <dvukovic@gmx.de>
Date: Sun, 19 Mar 2023 09:46:26 +0100
Subject: [PATCH] solve merge issues and include all previous changes

---
 720p/Includes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/720p/Includes.xml b/720p/Includes.xml
index b11d4250..f3ceffdc 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -549,12 +549,12 @@
 		<value>$INFO[ListItem.VideoCodec]</value>
 	</variable>
 	<variable name="SeekLabel">
-		<value condition="[Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek] | Player.IsTempo">$LOCALIZE[31042]</value>
+		<value condition="[Player.Playing + !Player.Seeking + !Player.HasPerformedSeek(3)] | Player.IsTempo">$LOCALIZE[31042]</value>
 		<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
 		<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
 		<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
-		<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
-		<value condition="!Player.DisplayAfterSeek + Player.Seeking">$LOCALIZE[31046]</value>
+		<value condition="Player.HasPerformedSeek(3) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
+		<value condition="!Player.HasPerformedSeek(3) + Player.Seeking">$LOCALIZE[31046]</value>
 		<value condition="Player.Forwarding">$LOCALIZE[31044]</value>
 		<value condition="Player.Rewinding">$LOCALIZE[31045]</value>
 	</variable>