From 6e9a9ced444c35e439d6a5fe192a1545cc319044 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Sun, 26 Jul 2026 22:25:32 -0400
Subject: [PATCH 1/2] Fix typo

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f6c438c..42d72499 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -244,7 +244,7 @@
     <string name="enable_screensaver">Enable screensaver</string>
     <string name="screensaver_filter">Set filter for screensaver</string>
     <string name="screensaver">Screensaver</string>
-    <string name="mpv_hardware_decoding">MPV: Ue hardware decoding</string>
+    <string name="mpv_hardware_decoding">MPV: Use hardware decoding</string>
     <string name="pref_key_mpv_hardware_decoding">playback.mpv.hardwareDecoding</string>
     <string name="pref_key_mpv_gpu_next">playback.mpv.gpuNext</string>
     <string name="mpv_gpu_next">MPV: Use gpu-next</string>

From d81082a9cb46aa259bc7b3a574188789819a4f43 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Sun, 26 Jul 2026 22:25:50 -0400
Subject: [PATCH 2/2] Fix accessing markers when up/down for previous/next is
 enabled

---
 .../stashapp/ui/components/playback/PlaybackPageContent.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/components/playback/PlaybackPageContent.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/components/playback/PlaybackPageContent.kt
index f9658a18..8601f4ca 100644
--- a/app/src/main/java/com/github/damontecres/stashapp/ui/components/playback/PlaybackPageContent.kt
+++ b/app/src/main/java/com/github/damontecres/stashapp/ui/components/playback/PlaybackPageContent.kt
@@ -1200,7 +1200,7 @@ class PlaybackKeyHandler(
         var result = true
         if (!controlsEnabled) {
             result = false
-        } else if (it.type == KeyEventType.KeyDown) {
+        } else if (it.type == KeyEventType.KeyDown && !controllerViewState.controlsVisible) {
             if (nextWithUpDown && (it.key == Key.DirectionUp || it.key == Key.DirectionDown)) {
                 val repeatCount = it.nativeKeyEvent.repeatCount
                 if (keyDownKey == null) {