From ef8d5dc91465eebd3e7c96e59d662a1e314f7362 Mon Sep 17 00:00:00 2001
From: candry7731 <83685828+candry7731@users.noreply.github.com>
Date: Sat, 12 Nov 2022 22:55:03 -0600
Subject: [PATCH] Fix nextup button when trickbar has focus

---
 components/JFVideo.brs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/JFVideo.brs b/components/JFVideo.brs
index 7d7d9c18..1d33709f 100644
--- a/components/JFVideo.brs
+++ b/components/JFVideo.brs
@@ -184,10 +184,15 @@ end sub
 
 function onKeyEvent(key as string, press as boolean) as boolean
 
-    if key = "OK" and m.nextEpisodeButton.hasFocus()
+    if key = "OK" and m.nextEpisodeButton.isinfocuschain() and m.top.trickPlayMode = "play"
         m.top.state = "finished"
         hidenextEpisode()
         return true
+    else
+        'Hide Next Episode Button
+        m.nextEpisodeButton.visible = false
+        m.nextEpisodeButton.setFocus(false)
+        m.top.setFocus(true)
     end if