From 62b45121e5f052634ac8f4554a58a5339257e460 Mon Sep 17 00:00:00 2001
From: Fredrik Burmester <fredrik.burmester@gmail.com>
Date: Sun, 11 Jan 2026 13:07:38 +0100
Subject: [PATCH] feat(settings): add toggle to disable auto-play next episode
 (#1342)

---
 .../settings/PlaybackControlsSettings.tsx     | 18 ++++++++++-
 .../video-player/controls/BottomControls.tsx  | 31 ++++++++++---------
 translations/en.json                          |  1 +
 utils/atoms/settings.ts                       |  2 ++
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/components/settings/PlaybackControlsSettings.tsx b/components/settings/PlaybackControlsSettings.tsx
index 58fbb92f..00348166 100644
--- a/components/settings/PlaybackControlsSettings.tsx
+++ b/components/settings/PlaybackControlsSettings.tsx
@@ -211,7 +211,23 @@ export const PlaybackControlsSettings: React.FC = () => {
           />
         </ListItem>
 
-        <ListItem title={t("home.settings.other.max_auto_play_episode_count")}>
+        <ListItem
+          title={t("home.settings.other.auto_play_next_episode")}
+          disabled={pluginSettings?.autoPlayNextEpisode?.locked}
+        >
+          <Switch
+            value={settings.autoPlayNextEpisode}
+            disabled={pluginSettings?.autoPlayNextEpisode?.locked}
+            onValueChange={(autoPlayNextEpisode) =>
+              updateSettings({ autoPlayNextEpisode })
+            }
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.other.max_auto_play_episode_count")}
+          disabled={!settings.autoPlayNextEpisode}
+        >
           <PlatformDropdown
             groups={autoPlayEpisodeOptions}
             trigger={
diff --git a/components/video-player/controls/BottomControls.tsx b/components/video-player/controls/BottomControls.tsx
index fb5b8d6f..51abf68c 100644
--- a/components/video-player/controls/BottomControls.tsx
+++ b/components/video-player/controls/BottomControls.tsx
@@ -148,21 +148,22 @@ export const BottomControls: FC<BottomControlsProps> = ({
             onPress={skipCredit}
             buttonText='Skip Credits'
           />
-          {(settings.maxAutoPlayEpisodeCount.value === -1 ||
-            settings.autoPlayEpisodeCount <
-              settings.maxAutoPlayEpisodeCount.value) && (
-            <NextEpisodeCountDownButton
-              show={
-                !nextItem
-                  ? false
-                  : // Show during credits if no content after, OR near end of video
-                    (showSkipCreditButton && !hasContentAfterCredits) ||
-                    remainingTime < 10000
-              }
-              onFinish={handleNextEpisodeAutoPlay}
-              onPress={handleNextEpisodeManual}
-            />
-          )}
+          {settings.autoPlayNextEpisode !== false &&
+            (settings.maxAutoPlayEpisodeCount.value === -1 ||
+              settings.autoPlayEpisodeCount <
+                settings.maxAutoPlayEpisodeCount.value) && (
+              <NextEpisodeCountDownButton
+                show={
+                  !nextItem
+                    ? false
+                    : // Show during credits if no content after, OR near end of video
+                      (showSkipCreditButton && !hasContentAfterCredits) ||
+                      remainingTime < 10000
+                }
+                onFinish={handleNextEpisodeAutoPlay}
+                onPress={handleNextEpisodeManual}
+              />
+            )}
         </View>
       </View>
       <View
diff --git a/translations/en.json b/translations/en.json
index d13ecc9a..e0da1638 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -278,6 +278,7 @@
         "disable_haptic_feedback": "Disable Haptic Feedback",
         "default_quality": "Default Quality",
         "default_playback_speed": "Default Playback Speed",
+        "auto_play_next_episode": "Auto-play Next Episode",
         "max_auto_play_episode_count": "Max Auto Play Episode Count",
         "disabled": "Disabled"
       },
diff --git a/utils/atoms/settings.ts b/utils/atoms/settings.ts
index 9c2d7e64..28f7d1b4 100644
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -180,6 +180,7 @@ export type Settings = {
   enableH265ForChromecast: boolean;
   maxAutoPlayEpisodeCount: MaxAutoPlayEpisodeCount;
   autoPlayEpisodeCount: number;
+  autoPlayNextEpisode: boolean;
   // Playback speed settings
   defaultPlaybackSpeed: number;
   playbackSpeedPerMedia: Record<string, number>;
@@ -264,6 +265,7 @@ export const defaultValues: Settings = {
   enableH265ForChromecast: false,
   maxAutoPlayEpisodeCount: { key: "3", value: 3 },
   autoPlayEpisodeCount: 0,
+  autoPlayNextEpisode: true,
   // Playback speed defaults
   defaultPlaybackSpeed: 1.0,
   playbackSpeedPerMedia: {},